dang it./wbuild.sh vga_state.vga_graphics_ram = video->omemptr; causes it to not...

diff --git a/q.sh b/q.sh
index 2a61f33..67cb826 100755 (executable)
--- a/q.sh
+++ b/q.sh
@@ -1,4 +1,4 @@
-grep -i "$1" src/*.c
-grep -i "$1" src/*.h
-grep -i "$1" src/lib/*.c
-grep -i "$1" src/lib/*.h
+grep "$1" src/*.c
+grep "$1" src/*.h
+grep "$1" src/lib/*.c
+grep "$1" src/lib/*.h

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index a14316b..9af21bc 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -32,7 +32,17 @@
 \r
 #define FUNCTIONKEYFUNCTIONS \\r
        if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 0, 0); IN_UserInput(1,1); } \\r
-       if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 0, 1); IN_UserInput(1,1); }\r
+       if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 0, 1); IN_UserInput(1,1); } \\r
+       if(IN_KeyDown(sc_T)){ \\r
+               switch(gvar.video.rs){\\r
+                       case 0:\\r
+                       case 1:\\r
+                               gvar.video.rs++;\\r
+                       break;\\r
+                       case 2:\\r
+                               gvar.video.rs=0;\\r
+                       break; }\\r
+                       IN_UserInput(1,1); }\r
 #define FUNCTIONKEYFUNCTIONS0EXE \\r
        if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[gvar.video.panp], 0, 0); IN_UserInput(1,1); } \\r
        if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[gvar.video.panp], 0, 1); IN_UserInput(1,1); }\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index cc96f29..1aa40e7 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -265,7 +265,8 @@ typedef struct
        byte vga_draw_stride;\r
        byte vga_draw_stride_limit;             // further X clipping\r
 //\r
-boolean __near p;                      //render page number //BLEH\r
+       word __near rs;                 //render switch\r
+       boolean __near p;                       //render page number //BLEH\r
        boolean __near r;                       //page flip if true\r
        word pr[MAXPAGE][4];    //render sections of pages (this is supposed to be set up to draw sections of the screen if updated)\r
 \r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 1c9f94d..408c349 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -297,6 +297,8 @@ void modexHiganbanaPageSetup(video_t *video)
        video->vga_draw_stride= vga_state.vga_draw_stride;\r
        video->vga_draw_stride_limit=   vga_state.vga_draw_stride_limit;\r
 \r
+       video->rs=0;\r
+\r
        //setup the buffersize\r
        video->page[0].dx=video->page[0].dy=\r
                video->page[1].dx=video->page[1].dy=TILEWH;     // 1 tile size buffer\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 082e48e..dacc9cb 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -25,8 +25,10 @@
 #include "src/lib/scroll16.h"\r
 \r
 #define ANIMATESPRIFUN ZC_animatePlayer\r
+#define INC_PER_FRAME_PRINT    sprintf(global_temp_status_text, "%u", player[pn].enti.persist_aniframe);\\r
+modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe), player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\r
 \r
-#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = 1;\r
+#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = 1; INC_PER_FRAME_PRINT\r
 \r
 void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
 {\r
@@ -50,9 +52,6 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        mapScrollRight(pip, player, (pip[0].video->p), pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                                       sprintf(global_temp_status_text, "%u", player[pn].enti.persist_aniframe);\r
-                                       modexprint(&(pip[0].video->page[0]), player[pn].enti.x+(8*player[pn].enti.persist_aniframe), player[pn].enti.y-TILEWH-8, 1, 8, 1, global_temp_status_text);\r
-                                       sleep(1);\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else if(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))\r
@@ -63,7 +62,6 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        player[pn].enti.x+=(player[pn].enti.speed);\r
                                        ANIMATESPRIFUN(pip, player, pn, 0);\r
                                        player[pn].enti.q++;\r
-                                       sleep(1);\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else\r
@@ -1105,6 +1103,50 @@ void shinku(global_game_variables_t *gv)
        }\r
 }\r
 \r
+void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word dire, word sw)\r
+{\r
+       int i=0;\r
+\r
+       switch(sw)\r
+       {\r
+               case 1:\r
+                       dire+=2;\r
+               break;\r
+               case 2:\r
+                       dire+=1;\r
+               break;\r
+//             case 3:\r
+//                     dire=dire;\r
+//             break;\r
+               case 4:\r
+                       dire+=2;\r
+               break;\r
+       }\r
+       if(pip[0].video->rs<2)\r
+       {\r
+               i = set_anim_by_id(player[pn].ent->spri, dire); if (i == -1) return;\r
+               //printf("RS<2\n");\r
+       }\r
+\r
+       switch(pip[0].video->rs)\r
+       {\r
+               case 0:\r
+                       animate_spri(player[pn].ent->spri, pip->video);\r
+               break;\r
+               case 1:\r
+                       oldanimate_spri(player[pn].ent->spri, pip->video);\r
+               break;\r
+               case 2:\r
+                       modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, dire);\r
+               break;\r
+       }\r
+}\r
+\r
+/*void ZC_odrawframe()\r
+{\r
+\r
+}*/\r
+\r
 #ifdef SPRITE\r
 #define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, dire, 24, 32,   PLAYERBMPDATAPTR);\r
 #define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32,   PLAYERBMPDATAPTR);\r
@@ -1205,7 +1247,6 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
        pip->video->r=1;\r
 }\r
 \r
-\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
 {\r
        sword x = player[pn].enti.x;\r
@@ -1213,9 +1254,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
        word dire=10; //direction\r
        sword qq; //scroll offset\r
        word ls = player[pn].enti.persist_aniframe;\r
-#ifndef SPRITO\r
-       int i=0;\r
-#endif\r
+\r
        switch(scrollswitch)\r
        {\r
                case 0:\r
@@ -1225,9 +1264,8 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
                        qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
                break;\r
        }\r
-#ifdef SPRITE\r
-       x-=4;\r
-#endif\r
+       if(pip[0].video->rs<2)\r
+               x-=4;\r
        y-=pip[0].map->tiles->tileHeight;\r
        switch (player[pn].enti.d)\r
        {\r
@@ -1263,33 +1301,20 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
 //#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
 //#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire);\r
 //#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
-#ifndef SPRITO\r
-//#define DRAWFRAME if (i == -1) return; oldanimate_spri(player[pn].ent->spri, pip->video)\r
-#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)\r
-#define NFRAME1 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
-#define NFRAME2 i = set_anim_by_id(player[pn].ent->spri, 1+dire);      DRAWFRAME;\r
-#define NFRAME3 i = set_anim_by_id(player[pn].ent->spri, dire);        DRAWFRAME;\r
-#define NFRAME4 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
-#else\r
-#define NFRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+dire);\r
-#define NFRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
-#define NFRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, dire);\r
-#define NFRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
-#endif\r
 \r
        switch(ls)\r
        {\r
                case 1:\r
-                       NFRAME1\r
+                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
                break;\r
                case 2:\r
-                       NFRAME2\r
+                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
                break;\r
                case 3:\r
-                       NFRAME3\r
+                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
                break;\r
                case 4:\r
-                       NFRAME4\r
+                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
                break;\r
        }\r
        pip->video->r=1;\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index fe3fe4e..eb6693d 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -42,7 +42,6 @@
 #include <hw/vga/vrl.h>\r
 \r
 #define SPRITE\r
-//#define SPRITO\r
 //#define TILERENDER\r
 \r
 //modexDrawSpritePBufRegion\r
@@ -161,6 +160,7 @@ void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
 //void qclean();\r
 void shinku(global_game_variables_t *gv);\r
+void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word dire, word sw);\r
 void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 \r
@@ -174,3 +174,89 @@ void walk_player(player_t *player, map_view_t *map_v);
 void near mapScroll(map_view_t *mv, player_t *player);\r
 \r
 #endif /*__SCROLL16_H_*/\r
+//older zc_animate\r
+//#define SPRITO\r
+/*void near ZC_animatePlayer_(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
+{\r
+       sword x = player[pn].enti.x;\r
+       sword y = player[pn].enti.y;\r
+       word dire=10; //direction\r
+       sword qq; //scroll offset\r
+       word ls = player[pn].enti.persist_aniframe;\r
+#ifndef SPRITO\r
+       int i=0;\r
+#endif\r
+       switch(scrollswitch)\r
+       {\r
+               case 0:\r
+                       qq = 0;\r
+               break;\r
+               default:\r
+                       qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
+               break;\r
+       }\r
+#ifdef SPRITE\r
+       x-=4;\r
+#endif\r
+       y-=pip[0].map->tiles->tileHeight;\r
+       switch (player[pn].enti.d)\r
+       {\r
+               case 0:\r
+                       //up\r
+                       dire*=player[pn].enti.d+1;\r
+                       y-=qq;\r
+               break;\r
+               case 3:\r
+                       // right\r
+                       dire*=(player[pn].enti.d-1);\r
+                       x+=qq;\r
+               break;\r
+               case 2:\r
+               break;\r
+               case 4:\r
+                       //down\r
+                       dire*=(player[pn].enti.d-1);\r
+                       y+=qq;\r
+               break;\r
+               case 1:\r
+                       //left\r
+                       dire*=(player[pn].enti.d+3);\r
+                       x-=qq;\r
+               break;\r
+       }\r
+\r
+       //setting xy position\r
+       player[pn].ent->spri->x = x;\r
+       player[pn].ent->spri->y = y;\r
+\r
+#ifndef SPRITO\r
+//#define DRAWFRAME if (i == -1) return; oldanimate_spri(player[pn].ent->spri, pip->video)\r
+#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)\r
+#define NFRAME1 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
+#define NFRAME2 i = set_anim_by_id(player[pn].ent->spri, 1+dire);      DRAWFRAME;\r
+#define NFRAME3 i = set_anim_by_id(player[pn].ent->spri, dire);        DRAWFRAME;\r
+#define NFRAME4 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
+#else\r
+#define NFRAME1 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, 2+dire);\r
+#define NFRAME2 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
+#define NFRAME3 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, dire);\r
+#define NFRAME4 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
+#endif\r
+\r
+       switch(ls)\r
+       {\r
+               case 1:\r
+                       NFRAME1\r
+               break;\r
+               case 2:\r
+                       NFRAME2\r
+               break;\r
+               case 3:\r
+                       NFRAME3\r
+               break;\r
+               case 4:\r
+                       NFRAME4\r
+               break;\r
+       }\r
+       pip->video->r=1;\r
+}*/\r

diff --git a/src/scroll.c b/src/scroll.c
index 3b31774..6baefa2 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -112,6 +112,8 @@ void main(int argc, char *argv[])
        modexHiganbanaPageSetup(&gvar.video);\r
        ZC_MVSetup(&mv, &map, &gvar);\r
 \r
+       //renderswitch\r
+       gvar.video.rs=2;\r
 \r
        /* set up paging */\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
@@ -119,6 +121,9 @@ void main(int argc, char *argv[])
 \r
        playerXYpos(0, 0, &player, &mv, 0);\r
        IN_initplayer(&player, 0);\r
+       player[0].ent->spri->x = player[0].enti.x-4;\r
+       player[0].ent->spri->y = player[0].enti.y-16;\r
+       player[0].ent->spri->delay = 0;\r
 \r
 #ifndef        SPRITE\r
        modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);\r

diff --git a/src/zcroll.c b/src/zcroll.c
index 7b6c03b..9e3c0b5 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -100,6 +100,9 @@ void main(int argc, char *argv[])
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
        ZC_MVSetup(&mv, &map, &gvar);\r
+\r
+       //renderswitch\r
+       gvar.video.rs=0;\r
        //player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;\r
 \r
        // set up paging\r