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

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

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 35874a09..d7b3f82e 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -1,7 +1,7 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
-openfiles: /dos/z/16/src/scroll.c:13044:12318:1:
+openfiles: /dos/z/16/src/scroll.c:15500:15216:1:
 openfiles: /dos/z/16/src/lib/modex16.c:136:0:0:
 openfiles: /dos/z/16/src/lib/modex16.h:1931:1068:0:
 openfiles: /dos/z/16/src/pcxtest.c:68:0:0:
diff --git a/scroll.exe b/scroll.exe
index f494d9bf..7532e826 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/scroll.c b/src/scroll.c
index 16561340..99cf8e6a 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -340,8 +340,6 @@ break;
 	printf("player.ty: %d\n", player.ty);
 	printf("player.triggx: %d\n", player.triggerx);
 	printf("player.triggy: %d\n", player.triggery);
-	printf("dxThresh: %d\n", bg->dxThresh);
-	printf("dyThresh: %d\n", bg->dyThresh);
 	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
 	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
 	printf("\n");
@@ -423,13 +421,13 @@ mapScrollRight(map_view_t *mv, byte offset, short lp) {
 	/* Snap the origin forward */
 	mv->page->data += 4;
 	mv->page->dx = mv->map->tiles->tileWidth;
-	}
+	//}
 
 	/* draw the next column */
 	x= SCREEN_WIDTH + mv->map->tiles->tileWidth;
-	if(lp%2)
+	//if(lp%4)
 		mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x, mv->page->dx);
-	//}
+	}
 }
 
 
@@ -448,11 +446,11 @@ mapScrollLeft(map_view_t *mv, byte offset, short lp) {
 	/* Snap the origin backward */
 	mv->page->data -= 4;
 	mv->page->dx = mv->map->tiles->tileWidth;
-	}
+	//}
 	/* draw the next column */
-	if(lp%2)
+	//if(lp%4)
 		mapDrawCol(mv, mv->tx-1, mv->ty-1, 0, mv->page->dx);
-	//}
+	}
 }
 
 
@@ -470,13 +468,13 @@ mapScrollUp(map_view_t *mv, byte offset, short lp) {
 	/* Snap the origin downward */
 	mv->page->data -= mv->page->width*4;
 	mv->page->dy = mv->map->tiles->tileHeight;
-	}
+	//}
 
 	/* draw the next row */
 	y= 0;
-	if(lp%3)
+	//if(lp%3)
 		mapDrawRow(mv, mv->tx-1 , mv->ty-1, y, mv->page->dy);
-	//}
+	}
 }
 
 
@@ -494,13 +492,13 @@ mapScrollDown(map_view_t *mv, byte offset, short lp) {
 	/* Snap the origin downward */
 	mv->page->data += mv->page->width*4;
 	mv->page->dy = mv->map->tiles->tileHeight;
-	}
+	//}
 
 	/* draw the next row */
 	y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;
-	if(lp%3)
+	//if(lp%3)
 		mapDrawRow(mv, mv->tx-1 , mv->ty+15, y, mv->page->dy);
-	//}
+	}
 
 }
 
@@ -545,11 +543,11 @@ void
 mapDrawRow(map_view_t *mv, int tx, int ty, word y, word poopoffset) {
 	word x;
 	int i;
-	poopoffset%=6;
-
+	poopoffset%=SPEED;
+printf("y: %d\n", poopoffset);
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(x=poopoffset*TILEWH; x<(SCREEN_WIDTH+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
+	for(x=poopoffset; x<(SCREEN_WIDTH+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
 	if(i>=0) {
 		/* we are in the map, so copy! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -563,14 +561,14 @@ void
 mapDrawCol(map_view_t *mv, int tx, int ty, word x, word poopoffset) {
 	int y;
 	int i;
-	poopoffset%=4;
-
+	poopoffset%=SPEED;
+printf("x: %d\n", poopoffset);
 	/* location in the map array */
 	i=ty * mv->map->width + tx;
 
 	/* We'll copy all of the columns in the screen, 
 	   i + 1 row above and one below */
-	for(y=poopoffset*TILEWH; y<(SCREEN_HEIGHT+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
+	for(y=poopoffset; y<(SCREEN_HEIGHT+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
 	if(i>=0) {
 		/* we are in the map, so copy away! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);