modified: Project 16.bfproject

	modified:   scroll.exe
	modified:   src/scroll.c

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 87d5db3a83423827b03385162df39de399595b19..35874a0957ecac2ae7e0320214c3d62e62b03d84 100644 (file)
--- 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:11889:11264:1:
+openfiles: /dos/z/16/src/scroll.c:13044:12318: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:
@@ -95,25 +95,25 @@ recent_files: file:///dos/z/keen-src/id_mm.c
 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/src/palettec.c
-recent_files: file:///dos/z/16/doc/project.txt
+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/modex16.h
-recent_files: file:///dos/z/16/src/pcxtest.c
-recent_files: file:///dos/z/16/src/lib/dos_kb.c
-recent_files: file:///dos/z/16/src/lib/dos_kb.h
 recent_files: file:///dos/z/16/src/lib/lib_head.h
+recent_files: file:///dos/z/16/src/lib/dos_kb.h
+recent_files: file:///dos/z/16/doc/project.txt
+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/src/lib/modex16.c
-recent_files: file:///dos/z/16/src/scroll.c
+recent_files: file:///dos/z/16/src/palettec.c
 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.c
 recent_files: file:///dos/z/16/src/lib/bitmap.h
-recent_files: file:///dos/z/16/src/lib/lib_head.cpp
 recent_files: file:///dos/z/16/src/lib/types.h
 recent_files: file:///dos/z/16/makefile
-recent_files: file:///dos/z/16/gfx.pal
-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
 recent_files: file:///dos/z/16/16/dos_gfx.h
+recent_files: file:///dos/z/16/16/dos_gfx.cpp
 snr_replacetype: 0
 savedir: file:///dos/z/16/src
 spell_check_default: 1

diff --git a/scroll.exe b/scroll.exe
index 5b78fd97f0789660ba7a9917b7a9f29a8fe156bd..f494d9bfb66f26186a5872a5fa876db35a63b45b 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index 5e561a8323b9a79fce944642af8c5537db46a0be..1656134034b70dbf43b7a461a801f3accc952219 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -428,8 +428,7 @@ mapScrollRight(map_view_t *mv, byte offset, short lp) {
        /* draw the next column */
        x= SCREEN_WIDTH + mv->map->tiles->tileWidth;
        if(lp%2)
-       //mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x, mv->page->dx);
-       mapDrawWCol(mv, mv->tx + 20 , mv->ty-1, x);
+               mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x, mv->page->dx);
        //}
 }
 
@@ -452,8 +451,7 @@ mapScrollLeft(map_view_t *mv, byte offset, short lp) {
        }
        /* draw the next column */
        if(lp%2)
-       //mapDrawCol(mv, mv->tx-1, mv->ty-1, 0, mv->page->dx);
-       mapDrawWCol(mv, mv->tx-1, mv->ty-1, 0);
+               mapDrawCol(mv, mv->tx-1, mv->ty-1, 0, mv->page->dx);
        //}
 }
 
@@ -477,8 +475,7 @@ mapScrollUp(map_view_t *mv, byte offset, short lp) {
        /* draw the next row */
        y= 0;
        if(lp%3)
-       //mapDrawRow(mv, mv->tx-1 , mv->ty-1, y, mv->page->dy);
-       mapDrawWRow(mv, mv->tx-1 , mv->ty-1, y);
+               mapDrawRow(mv, mv->tx-1 , mv->ty-1, y, mv->page->dy);
        //}
 }
 
@@ -502,8 +499,7 @@ mapScrollDown(map_view_t *mv, byte offset, short lp) {
        /* draw the next row */
        y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;
        if(lp%3)
-       //mapDrawRow(mv, mv->tx-1 , mv->ty+15, y, mv->page->dy);
-       mapDrawWRow(mv, mv->tx-1 , mv->ty+15, y);
+               mapDrawRow(mv, mv->tx-1 , mv->ty+15, y, mv->page->dy);
        //}
 
 }
@@ -553,7 +549,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y, word poopoffset) {
 
        /* the position within the map array */
        i=ty * mv->map->width + tx;
-       for(x=poopoffset; x<(SCREEN_WIDTH+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
+       for(x=poopoffset*TILEWH; 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);
@@ -574,7 +570,7 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x, word poopoffset) {
 
        /* We'll copy all of the columns in the screen, 
           i + 1 row above and one below */
-       for(y=poopoffset; y<(SCREEN_HEIGHT+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
+       for(y=poopoffset*TILEWH; 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);