From: sparky4 <sparky4@cock.li>
Date: Mon, 1 Dec 2014 22:32:38 +0000 (-0600)
Subject: 	modified:   Project 16.bfproject
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=7fb35f10d056cc575c2c3c3e4a01a4d859782044

	modified:   Project 16.bfproject
	modified:   scroll.exe
	modified:   src/scroll.c
---

diff --git a/Project 16.bfproject b/Project 16.bfproject
index c2286020..27ed4c90 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -2,8 +2,8 @@ c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
 openfiles: /dos/z/16/16.c:25:0:0:
-openfiles: /dos/z/16/src/scroll.c:5954:5217:1:
-openfiles: /dos/z/16/src/lib/scroll.c:0:0:0:
+openfiles: /dos/z/16/src/scroll.c:12603:12335:1:
+openfiles: /dos/z/16/src/lib/scroll.c:1178:1022:0:
 openfiles: /dos/z/16/src/lib/scroll.h:1961:598:0:
 openfiles: /dos/z/16/src/lib/modex16.c:136:0:0:
 openfiles: /dos/z/16/src/lib/modex16.h:3194:2077:0:
@@ -35,7 +35,7 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/16/16
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: PalFile
+ssearch_text: Wrow
 snr_casesens: 1
 view_blocks: 1
 name: project 16
@@ -53,7 +53,7 @@ replacelist: TRIGGY
 replacelist: TRIGGX
 replacelist: $(SRCLIB)
 replacelist: $(SRC)
-replacelist:  SPEED);
+replacelist: SPEED);
 fb_show_hidden_f: 0
 editor_tab_width: 4
 show_visible_spacing: 1
@@ -96,26 +96,26 @@ recent_files: file:///dos/z/keen-src/id_rf.h
 recent_files: file:///dos/z/keen-src/id_rf_a.asm
 recent_files: file:///dos/z/keen-src/id_rf.c
 recent_files: file:///dos/z/16/gfx.pal
+recent_files: file:///dos/z/16/src/scroll.c
 recent_files: file:///dos/z/16/src/lib/scroll.c
-recent_files: file:///dos/z/16/src/lib/scroll.h
 recent_files: file:///dos/z/16/src/lib/modex16.h
-recent_files: file:///dos/z/16/16.c
 recent_files: file:///dos/z/16/doc/project.txt
-recent_files: file:///dos/z/16/src/pcxtest.c
-recent_files: file:///dos/z/16/src/scroll.c
-recent_files: file:///dos/z/16/src/lib/modex16.c
 recent_files: file:///dos/z/16/src/lib/dos_kb.h
+recent_files: file:///dos/z/16/src/lib/scroll.h
 recent_files: file:///dos/z/16/src/lib/dos_kb.c
+recent_files: file:///dos/z/16/src/pcxtest.c
+recent_files: file:///dos/z/16/16.c
+recent_files: file:///dos/z/16/src/lib/modex16.c
 recent_files: file:///dos/z/16/src/lib/lib_head.h
-recent_files: file:///dos/z/16/src/test2.c
 recent_files: file:///dos/z/16/src/palettec.c
-recent_files: file:///dos/z/16/src/lib/bitmap.h
 recent_files: file:///dos/z/16/src/test.c
+recent_files: file:///dos/z/16/src/test2.c
+recent_files: file:///dos/z/16/src/lib/bitmap.h
 recent_files: file:///dos/z/16/src/lib/types.h
 recent_files: file:///dos/z/16/makefile
-recent_files: file:///dos/z/16/src/lib/bitmap.c
 recent_files: file:///dos/z/16/16/dos_gfx.h
 recent_files: file:///dos/z/16/16/dos_gfx.cpp
+recent_files: file:///dos/z/16/src/lib/bitmap.c
 recent_files: file:///dos/z/16/src/lib/lib_head.cpp
 snr_replacetype: 0
 savedir: file:///dos/z/16/src
@@ -128,7 +128,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: cra
 searchlist: drawtile
 searchlist: UpdateTiles
 searchlist: dyThresh
@@ -142,7 +141,8 @@ searchlist: dxThresh
 searchlist: PalFile
 searchlist: src\\lib\\
 searchlist: src\\
-searchlist:  SPEED, q);
+searchlist: SPEED, q);
+searchlist: Wrow
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
diff --git a/scroll.exe b/scroll.exe
index ff8cfbad..20e170d4 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/scroll.c b/src/scroll.c
index 36a8f163..6533b67c 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -132,37 +132,6 @@ void main() {
 
 	#define INC_PER_FRAME if(q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;	
 
-	//temp testing
-		/*if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10)
-		{
-			for(q=1; q<=(TILEWH/SPEED); q++)
-			{
-				//INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				//animatePlayer(bg, spri, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				mapScrollRight(bg, SPEED);
-				//mapScrollRight(spri, SPEED);
-				//mapScrollRight(mask, SPEED);
-				modexShowPage(bg->page);
-			}
-			player.tx++;
-		}
-		else if(player.tx < MAPX)
-		{
-			for(q=1; q<=(TILEWH/SPEED); q++)
-			{
-				INC_PER_FRAME;
-				player.x+=SPEED;
-				//animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				modexShowPage(spri->page);
-			}
-			player.tx++;
-		}
-		else
-		{
-break;
-		}*/
 	if(keyp(77) && !keyp(75))
 	{
 		if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))
@@ -517,7 +486,7 @@ mapGoTo(map_view_t *mv, int tx, int ty) {
 	py=0;
 	i=mv->ty * mv->map->width + mv->tx;
 	for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
-		mapDrawWRow(mv, tx-1, ty, py);
+		mapDrawRow(mv, tx-1, ty, py);
 	i+=mv->map->width - tx;
 	}
 }