modified: README

	modified:   TODO
	modified:   scroll.c
	modified:   scroll.exe

diff --git a/README b/README
index 42e5dfe983e5dadc713eb090052a5ff6e8d9d657..23a3a37cc28c6b43480044f2727a264da479fe22 100644 (file)
--- a/README
+++ b/README
@@ -4,9 +4,9 @@ Open watcom to compile the code of project 16
 16/modex16/ = pngwen's code archived\r
 \r
 TODO not in particular order~:\r
-almost done 1. SCROLLING!!!!!!!\r
+DONE 1. SCROLLING!!!!!!!\r
 2. Fix pngwen's pcx rendering code it dose not render large relolution pcx files well at all!\r
-3.  Erase player sprite when moving and tweak it\r
+3. tweak animation frame perloop and make the dpad controls a case switch (look at commander keen code?) and vsync horizontal animation\r
 DONE 4. movement and player movement when reaching edge of map\r
 DONE 5. sprite rendering\r
 6. text box rendering\r
@@ -16,5 +16,5 @@ DONE 5. sprite rendering
 10. map and item interation\r
 11. item inventory~\r
 \r
-To compile:
-You need Open Watcom stable to compile and just run wmake
\ No newline at end of file
+To compile:\r
+You need Open Watcom stable to compile and just run wmake\r

diff --git a/TODO b/TODO
index 59a676b1b762c4e95e6ed8126027a35b3d8bff7e..71a81b434fb9f4c1f01de0af873dd602848a2e77 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,10 +1,8 @@
 16/ is a working branch of project 16\r
 \r
 What needs to be done\r
-1. Map system and movement\r
+1. Map/event system and movement\r
 Look at the game Pokemon Crystal and Ib for an example of what I mean\r
-pngwen is making this part!\r
-\r
 2. sprite loading and rendering! properly\r
 3. font and text box rendering and system\r
 4. map rendering\r

diff --git a/scroll.c b/scroll.c
index 8f27cbb01dd480b90793830d52b5425bcd2c5d04..ff33e3f0219b77fe60bd2551f36edce2dc157ef7 100644 (file)
--- a/scroll.c
+++ b/scroll.c
@@ -51,7 +51,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty);
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-void animatePlayer(map_view_t *mv, map_view_t *src, short d1, short d2, int x, int y, int ls, bitmap_t *bmp);
+void animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int y, int ls, bitmap_t *bmp);
 
 #define TILEWH 16
 #define QUADWH (TILEWH/4)
@@ -121,7 +121,7 @@ void main() {
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
-                               animatePlayer(spri, bg, 1, 1, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 1, 1, player.x, player.y, q, &ptmp);
                                mapScrollRight(bg, SPEED);
                                mapScrollRight(spri, SPEED);
                                modexShowPage(spri->page);
@@ -133,7 +133,7 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.x+=SPEED;
-                               animatePlayer(spri, bg, 1, 0, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 1, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(spri->page);
                        }
                        player.tx++;
@@ -147,7 +147,7 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                
-                               animatePlayer(spri, bg, 3, 1, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 3, 1, player.x, player.y, q, &ptmp);
                                mapScrollLeft(bg, SPEED);
                                mapScrollLeft(spri, SPEED);
                                modexShowPage(spri->page);
@@ -159,7 +159,7 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.x-=SPEED;
-                               animatePlayer(spri, bg, 3, 0, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 3, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(spri->page);
                        }
                        player.tx--;
@@ -172,7 +172,7 @@ void main() {
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
-                               animatePlayer(spri, bg, 2, 1, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 2, 1, player.x, player.y, q, &ptmp);
                                mapScrollDown(bg, SPEED);
                                mapScrollDown(spri, SPEED);
                                modexShowPage(spri->page);
@@ -184,7 +184,7 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.y+=SPEED;
-                               animatePlayer(spri, bg, 2, 0, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 2, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(spri->page);
                        }
                        player.ty++;
@@ -197,7 +197,7 @@ void main() {
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
-                               animatePlayer(spri, bg, 0, 1, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 0, 1, player.x, player.y, q, &ptmp);
                                mapScrollUp(bg, SPEED);
                                mapScrollUp(spri, SPEED);
                                modexShowPage(spri->page);
@@ -209,7 +209,7 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.y-=SPEED;
-                               animatePlayer(spri, bg, 0, 0, player.x, player.y, q, &ptmp);
+                               animatePlayer(bg, spri, 0, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(spri->page);
                        }
                        player.ty--;
@@ -447,7 +447,8 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
        }
 }
 
-void animatePlayer(map_view_t *mv, map_view_t *src, short d1, short d2, int x, int y, int ls, bitmap_t *bmp)
+void
+animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int y, int ls, bitmap_t *bmp)
 {
        short dire=32*d1;
        short qq;
@@ -479,12 +480,12 @@ void animatePlayer(map_view_t *mv, map_view_t *src, short d1, short d2, int x, i
                        y=y-TILEWH;
                break;
        }               //TODO: make flexible animation thingy
-                       if(ls<1) { modexCopyPageRegion(mv->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(mv->page, x, y, 24, dire, 24, 32, bmp); }else
-                       if(4>ls && ls>=1) { modexCopyPageRegion(mv->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(mv->page, x, y, 48, dire, 24, 32, bmp); }else
-                       if(7>ls && ls>=4) { modexCopyPageRegion(mv->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(mv->page, x, y, 0, dire, 24, 32, bmp); }else
-                       if(8>=ls && ls>=7) { modexCopyPageRegion(mv->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(mv->page, x, y, 24, dire, 24, 32, bmp); }else ls-=ls;
+                       if(ls<1) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
+                       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else
+                       if(4>ls && ls>=1) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
+                       modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else
+                       if(7>ls && ls>=4) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
+                       modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else
+                       if(8>=ls && ls>=7) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
+                       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else ls-=ls;
 }

diff --git a/scroll.exe b/scroll.exe
index 93e386f9a7cce13aa0fd1519179eb9b8d70d8ecb..ec9b1125e71c6e8c4ee90763cb29f854fa6e182e 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ