modified: Project 16.bfproject

	modified:   scroll.c
	modified:   scroll.exe

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 07c6820679c2fd880cf6867df051ab0813963094..5e39df7f95b52f08b0a0caf11ff999ce43ba7fec 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -1,13 +1,13 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:102:0:0:
-openfiles: /dos/z/16/scroll.c:2377:1837:1:
+openfiles: /dos/z/16/scroll.c:12991:12348:1:
 openfiles: /dos/z/16/modex16.c:9475:0:0:
 openfiles: /dos/z/16/modex16.h:1512:344:0:
 openfiles: /dos/z/16/pcxtest.c:1339:442:0:
-openfiles: /dos/z/16/dos_kb.c:3759:3388:0:
+openfiles: /dos/z/16/dos_kb.c:3759:2934:0:
 openfiles: /dos/z/16/dos_kb.h:464:0:0:
-openfiles: /dos/z/16/lib/lib_head.h:2319:1809:0:
+openfiles: /dos/z/16/lib/lib_head.h:2319:1512:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -97,13 +97,13 @@ recent_files: file:///dos/z/16/16/modex16/dos_kb.h
 recent_files: file:///dos/z/16/doc/16.16
 recent_files: file:///dos/z/16/doc/16story.txt
 recent_files: file:///dos/z/16/scroll.c
-recent_files: file:///dos/z/16/modex16.h
 recent_files: file:///dos/z/16/doc/project.txt
+recent_files: file:///dos/z/16/lib/lib_head.h
+recent_files: file:///dos/z/16/dos_kb.c
+recent_files: file:///dos/z/16/dos_kb.h
+recent_files: file:///dos/z/16/modex16.h
 recent_files: file:///dos/z/16/pcxtest.c
 recent_files: file:///dos/z/16/modex16.c
-recent_files: file:///dos/z/16/dos_kb.h
-recent_files: file:///dos/z/16/dos_kb.c
-recent_files: file:///dos/z/16/lib/lib_head.h
 snr_replacetype: 0
 savedir: file:///dos/z/16
 spell_check_default: 1

diff --git a/scroll.c b/scroll.c
index fdfd4e9f7b105cdb8741cb20d09b4389d31fd6ec..2e27dbc312d62a44ba38bfde2842685e40e3b970 100644 (file)
--- a/scroll.c
+++ b/scroll.c
@@ -72,7 +72,7 @@ void main() {
 \r
        setkb(1);\r
        /* create the map */\r
-       map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be bgn properly\r
+       map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
        initMap(&map);\r
        mv.map = ↦\r
        mv2.map = ↦\r
@@ -238,7 +238,7 @@ void main() {
                        modexShowPage(spri->page);\r
                }\r
        }\r
-       \r
+\r
        }\r
 \r
        modexLeave();\r
@@ -308,7 +308,7 @@ initMap(map_t *map) {
 \r
 void\r
 mapScrollRight(map_view_t *mv, byte offset) {\r
-       word x, y;  /* coordinate for bging */\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dx += offset;\r
@@ -322,7 +322,7 @@ mapScrollRight(map_view_t *mv, byte offset) {
        mv->page->dx = mv->map->tiles->tileWidth;\r
 \r
 \r
-       /* bg the next column */\r
+       /* draw the next column */\r
        x= SCREEN_WIDTH + mv->map->tiles->tileWidth;\r
                mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);\r
        }\r
@@ -331,7 +331,7 @@ mapScrollRight(map_view_t *mv, byte offset) {
 \r
 void\r
 mapScrollLeft(map_view_t *mv, byte offset) {\r
-       word x, y;  /* coordinate for bging */\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dx -= offset;\r
@@ -345,7 +345,7 @@ mapScrollLeft(map_view_t *mv, byte offset) {
        mv->page->data -= 4;\r
        mv->page->dx = mv->map->tiles->tileWidth;\r
 \r
-       /* bg the next column */\r
+       /* draw the next column */\r
                mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);\r
        }\r
 }\r
@@ -353,7 +353,7 @@ mapScrollLeft(map_view_t *mv, byte offset) {
 \r
 void\r
 mapScrollUp(map_view_t *mv, byte offset) {\r
-       word x, y;  /* coordinate for bging */\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dy -= offset;\r
@@ -367,7 +367,7 @@ mapScrollUp(map_view_t *mv, byte offset) {
        mv->page->dy = mv->map->tiles->tileHeight;\r
 \r
 \r
-       /* bg the next row */\r
+       /* draw the next row */\r
        y= 0;\r
                mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);\r
        }\r
@@ -376,7 +376,7 @@ mapScrollUp(map_view_t *mv, byte offset) {
 \r
 void\r
 mapScrollDown(map_view_t *mv, byte offset) {\r
-       word x, y;  /* coordinate for bging */\r
+       word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
        mv->page->dy += offset;\r
@@ -390,7 +390,7 @@ mapScrollDown(map_view_t *mv, byte offset) {
        mv->page->dy = mv->map->tiles->tileHeight;\r
 \r
 \r
-       /* bg the next row */\r
+       /* draw the next row */\r
        y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;\r
                mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);\r
        }\r
@@ -413,7 +413,7 @@ mapGoTo(map_view_t *mv, int tx, int ty) {
        mv->dxThresh = mv->map->tiles->tileWidth * 2;\r
        mv->dyThresh = mv->map->tiles->tileHeight * 2;\r
 \r
-       /* bg the tiles */\r
+       /* draw the tiles */\r
        modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);\r
        py=0;\r
        i=mv->ty * mv->map->width + mv->tx;\r
@@ -502,13 +502,15 @@ animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int
                        x=x-qq-4;\r
                        y=y-TILEWH;\r
                break;\r
-       }               //TODO: make flexible animation thingy\r
-                       if(2>ls && ls>=0) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-                       modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); modexWaitBorder();  }else\r
-                       if(4>ls && ls>=2) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-                       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); modexWaitBorder();  }else\r
-                       if(6>ls && ls>4) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-                       modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); modexWaitBorder();  }else\r
-                       if(8>ls && ls>6) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-                       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); modexWaitBorder();  }else ls-=ls;\r
+       }
+       //TODO: make flexible animation thingy\r
+       if(2>ls && ls>=0) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
+       modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else\r
+       if(4>ls && ls>=2) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
+       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else\r
+       if(6>ls && ls>=4) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
+       modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else\r
+       if(8>ls && ls>=6) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
+       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else ls-=ls;
+       modexWaitBorder();\r
 }\r

diff --git a/scroll.exe b/scroll.exe
index f8d42a1af7fd6d1f72f646aae9e5f26596f41afb..28987bc3cd33058d9d9f9f51cc5e24b66e91a582 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ