modified: Project 16.bfproject

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

diff --git a/Project 16.bfproject b/Project 16.bfproject
index ebde19a..83e3284 100644 (file)
--- 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:0:0:0:
-openfiles: /dos/z/16/src/scroll.c:17044:16836:1:
-openfiles: /dos/z/16/src/lib/scroll.c:1666:0:0:
+openfiles: /dos/z/16/src/scroll.c:17553:16983:1:
+openfiles: /dos/z/16/src/lib/scroll.c:359:0:0:
 openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0:
 openfiles: /dos/z/16/src/v2/source/ENGINE/CONTROLS.C:2441:1179:0:
 openfiles: /dos/z/16/src/lib/modex16.c:13778:13034:0:

diff --git a/scroll.exe b/scroll.exe
index 7fb7acb..28cab8a 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index eca090f..f511073 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -32,8 +32,7 @@ typedef struct {
        word dyThresh; //????\r
 } map_view_t;\r
 \r
-//TODO: make this into actor_t\r
-struct {\r
+typedef struct {\r
        int x; //player exact position on the viewable map\r
        int y; //player exact position on the viewable map\r
        int tx; //player tile position on the viewable map\r
@@ -43,7 +42,7 @@ struct {
        word q; //loop variable\r
        word d; //direction\r
        int hp; //hitpoints of the player\r
-} player;\r
+} actor_t;\r
 \r
 \r
 map_t allocMap(int w, int h);\r
@@ -55,8 +54,8 @@ void mapScrollDown(map_view_t *mv, byte offset);
 void mapGoTo(map_view_t *mv, int tx, int ty);\r
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);\r
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-void dpad(sword k);\r
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);\r
+sword dpad(actor_t *qd);\r
 void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp);\r
 \r
 #define TILEWH 16\r
@@ -77,12 +76,11 @@ void main() {
        page_t screen, screen2, screen3;\r
        map_t map;\r
        map_view_t mv, mv2, mv3;\r
-       map_view_t *bg, *spri, *mask;//, *tmp;\r
+       map_view_t *bg, *spri, *mask;//, *tmp;
        byte *pal;\r
        byte *ptr;\r
+       actor_t player;\r
 \r
-       player.q=1;\r
-       player.d=0;\r
 \r
        /* save the palette */\r
        pal  = modexNewPal();\r
@@ -126,16 +124,17 @@ void main() {
        //mapGoTo(mask, 0, 0);\r
 \r
        //TODO: put player in starting position of spot\r
-       //default player position on the viewable map\r
+       //default player position on the viewable map
        player.tx = bg->tx + 10;\r
        player.ty = bg->ty + 8;\r
        player.x = player.tx*TILEWH;\r
        player.y = player.ty*TILEWH;\r
        player.triggerx = player.tx;\r
        player.triggery = player.ty+1;\r
-       //TODO: erase player initial draw\r
+       player.q=0;\r
+       player.d=0;\r
        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);\r
-       //temp draw trigger box\r
+\r
        modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
        modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
        modexShowPage(spri->page);\r
@@ -146,10 +145,12 @@ void main() {
        //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map\r
 \r
 \r
-       //TODO: make this better like rpg maker 2000 better
-       if(player.q == 1)
+       //TODO: make this better like rpg maker 2000 better\r
+       if(player.q <= 1)\r
        {\r
-               dpad(0/*, 0*/);
+               dpad(&player);
+               if(player.d>0) dpad(&player);
+               if(player.q<1) player.q++;\r
        }\r
 \r
        #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;\r
@@ -158,7 +159,6 @@ void main() {
        {\r
                if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -169,11 +169,10 @@ void main() {
                                //mapScrollRight(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.tx++; }\r
+                       } else { player.q = 0; player.d = 0; player.tx++; }\r
                }\r
                else if(player.tx < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -182,7 +181,7 @@ void main() {
                                animatePlayer(bg, spri, 1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.tx++; }\r
+                       } else { player.q = 0; player.d = 0; player.tx++; }\r
                }\r
                else\r
                {\r
@@ -199,7 +198,6 @@ void main() {
        {\r
                if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -210,11 +208,10 @@ void main() {
                                //mapScrollLeft(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.tx--; }\r
+                       } else { player.q = 0; player.d = 0; player.tx--; }\r
                }\r
                else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -223,7 +220,7 @@ void main() {
                                animatePlayer(bg, spri, 3, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.tx--; }\r
+                       } else { player.q = 0; player.d = 0; player.tx--; }\r
                }\r
                else\r
                {\r
@@ -240,7 +237,6 @@ void main() {
        {\r
                if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -251,11 +247,10 @@ void main() {
                                //mapScrollDown(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.ty++; }\r
+                       } else { player.q = 0; player.d = 0; player.ty++; }\r
                }\r
                else if(player.ty < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -264,7 +259,7 @@ void main() {
                                animatePlayer(bg, spri, 2, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.ty++; }\r
+                       } else { player.q = 0; player.d = 0; player.ty++; }\r
                }\r
                else\r
                {\r
@@ -281,7 +276,6 @@ void main() {
        {\r
                if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -292,11 +286,10 @@ void main() {
                                //mapScrollUp(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.ty--; }\r
+                       } else { player.q = 0; player.d = 0; player.ty--; }\r
                }\r
                else if(player.ty > 1 && !(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))\r
                {\r
-                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
@@ -305,7 +298,7 @@ void main() {
                                modexShowPage(spri->page);\r
                                animatePlayer(bg, spri, 0, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                player.q++;\r
-                       } else { player.q = 1; player.d = 0; player.ty--; }\r
+                       } else { player.q = 0; player.d = 0; player.ty--; }\r
                }\r
                else\r
                {\r
@@ -449,7 +442,7 @@ mapScrollLeft(map_view_t *mv, byte offset) {
        if(mv->page->dx == 0) {\r
        /* go backward one tile */\r
        mv->tx--;\r
-               \r
+\r
        /* Snap the origin backward */\r
        mv->page->data -= 4;\r
        mv->page->dx = mv->map->tiles->tileWidth;\r
@@ -577,32 +570,41 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
        i += mv->map->width;\r
        }\r
 }\r
-
-//sword
-void
-dpad(sword k/*, sword q*/)
-{\r
-       //printf("p1: %d\n", k);
-       //keypressed=0;
-       //if(q>1){ q=0; return q; }
-       //if(keypressed>1){ keypressed=0; return keypressed; }
-       if(k==0)
+\r
+sword\r
+dpad(actor_t *qd)\r
+{
+       if((keyp(75) && !keyp(77))) qd->d = 4; //left
+       if((keyp(80) && !keyp(72))) qd->d = 3; //down
+       if((keyp(77) && !keyp(75))) qd->d = 2; //right
+       if((keyp(72) && !keyp(80))) qd->d = 1; //up\r
+/*     if(qd->d==0)\r
        {
-               if(keyp(75) && !keyp(77)){ player.d = 4; k++; }
-               if(keyp(80) && !keyp(72)){ player.d = 3; k++; }
-               if(keyp(77) && !keyp(75)){ player.d = 2; k++; }\r
-               if(keyp(72) && !keyp(80)){ player.d = 1; k++; }
+               //if((keyp(80) || keyp(72)))\r
+               //{
+                       if((keyp(72) && !keyp(80))&&qd->d==0) qd->d = 1; //up\r
+                       if((keyp(80) && !keyp(72))&&qd->d==0) qd->d = 3; //down
+               //}\r
+               //if((keyp(75) || keyp(77)))\r
+               //{\r
+                       if((keyp(75) && !keyp(77))&&qd->d==0) qd->d = 4; //left\r
+                       if((keyp(77) && !keyp(75))&&qd->d==0) qd->d = 2; //right\r
+               //}
        }
        else
        {
-               if(keyp(72) && !keyp(80)){ player.d = 1; k--; }
-               if(keyp(77) && !keyp(75)){ player.d = 2; k--; }
-               if(keyp(80) && !keyp(72)){ player.d = 3; k--; }
-               if(keyp(75) && !keyp(77)){ player.d = 4; k--; }
-       } 
-       //printf("p2: %d\n", k);
-       if(k>1/* || k<-1*/){ dpad(k); }
-       //return keypressed=0;
+       if((qd->d==2 || qd->d==4))
+       {
+               if(keyp(72) && !keyp(80)) qd->d = 1; //up\r
+               if(keyp(80) && !keyp(72)) qd->d = 3; //down
+       }
+       else if((qd->d==1 || qd->d==3))
+       {
+               if(keyp(75) && !keyp(77)) qd->d = 4; //left\r
+               if(keyp(77) && !keyp(75)) qd->d = 2; //right
+       }
+       }*/\r
+       return qd->d;\r
 }
 \r
 void\r