just pushing before i use ZC_mapscroll

diff --git a/MEMINFO.16W b/MEMINFO.16W
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/ZCROLL.L16 b/ZCROLL.L16
new file mode 100755 (executable)
index 0000000..2713cd7
--- /dev/null
+++ b/ZCROLL.L16
@@ -0,0 +1,22 @@
+\r
+Project 16 zcroll.exe. This is just a test file!\r
+version Feb  3 2017 10:20:45\r
+[0]txy: 0x0    [1]txy: 0x0\r
+\r
+player vars:\r
+       xy: 160x128     txy: 20x8       triggxy: 21x8   value: 1\r
+       hp: 4   q: 1    info.dir: 2     d: 2    pdir: 3\r
+       delay=1\r
+\r
+VL_PrintmodexmemInfo:\r
+  Virtual Screen: 352x272      Tile: 22x17=((Virtual Screen)/16)\r
+         Screen: 320x240       Tile: 20x15=((Screen)/16)\r
+  Free Video Memory: 767\r
+  page [0]=(a000:0028) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
+       [1]=(a000:5da8) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
+       [2]=(a000:bb28) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
+       [3]=(a000:dc28) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
+gvar.video.r=0 gvar.video.bgps=1 \r
+\r
+detected CPU type: 80386 or newer\r
+detected FPU type: 80387\r

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 25436f8191235e2b0db8bd870a196141e3bc179c..c5e9b5ce3c7eb99273a982c8807e767ca359f80f 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -38,6 +38,7 @@
 #define FILEREAD\r
 //#define EXMMVERBOSE\r
 \r
+void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv){}\r
 #define PRINTBB { printf("&main()=     %Fp\n", argv[0]);printf("bigbuffer=     %Fp\n", bigbuffer);printf("&bigbuffer=  %Fp\n", &bigbuffer);printf("bigbuffer=  %04x\n", bigbuffer);printf("&bigbuffer= %04x\n", &bigbuffer); }\r
 \r
 #ifdef __WATCOMC__\r

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 4e8c2d10c16f5f2ec950e5adeede119f2a5fc045..463055a1f78d0c2ce9a49c81a1f7fcfdfddeed00 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -109,6 +109,7 @@ void Shutdown16(global_game_variables_t *gvar)
 #endif\r
        CA_Shutdown(gvar);\r
        MM_Shutdown(gvar);\r
+       VGAmodeX(0, 1, gvar);\r
 }\r
 \r
 \r
@@ -346,7 +347,7 @@ void Quit (global_game_variables_t *gvar, char *error)
 \r
        if (error && *error)\r
        {\r
-               movedata((unsigned)screen,7,0xb800,0,7*160);\r
+               //movedata((unsigned)screen,7,0xb800,0,7*160);\r
                gotoxy (10,4);\r
                fprintf(stderr, "%s\n", error);\r
                gotoxy (1,8);\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index ac300b1829dd05f2ffd1069a3e7b329d7404b7ee..b250e15582830a43c35db4a026ed4c31c92cf579 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -29,6 +29,7 @@
 #include "src/lib/16_mm.h"\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_in.h"\r
+#include "src/lib/16_vl.h"\r
 #include "src/lib/testpatt.h"\r
 \r
 #define FUNCTIONKEYFUNCTIONS \\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 56b60684a85fea1818b12799f19218e64f0ef1c0..63b3611accdfe650c7e86372ab33000406f13eaa 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -1334,6 +1334,15 @@ modexWaitBorder() {
        }\r
 }\r
 \r
+void\r
+modexWaitBorder_start()\r
+{\r
+       while(inp(INPUT_STATUS_1)  & 8)  {\r
+       // spin\r
+       }\r
+\r
+}\r
+\r
 //\r
 // printings of video memory information\r
 //\r

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 41e037629bc0b6f99d52da93bd45f9b2b4bbe11b..d2d75fb79f49ec5f255ea2acfc091ca79c11885a 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -173,6 +173,7 @@ void modexpdump(page_t *pee);
 void modexcls(page_t *page, byte color, byte *Where);\r
 void VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);\r
 void modexWaitBorder();\r
+void modexWaitBorder_start();\r
 void VL_PrintmodexmemInfo(video_t *v);\r
 \r
 #endif\r

diff --git a/src/lib/doslib b/src/lib/doslib
index df3936dfd8af45cf82c04bce8c40485e0cabe700..4dacdfcbe26c301fc4a368c58254c20b07f3a839 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit df3936dfd8af45cf82c04bce8c40485e0cabe700
+Subproject commit 4dacdfcbe26c301fc4a368c58254c20b07f3a839

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index c11f49bfd6ba86c482f79303308f2449607e66d0..45f4709a7b3d26c0c454815e791218d4cb62c7e6 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -25,6 +25,22 @@
 #include "src/lib/scroll16.h"\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 ZC_WALKR       ScrollRight(pip, player, 3, pn); \\r
+                               ScrollRight(pip, player, 2, pn); \\r
+                               mapScrollRight(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollRight(pip, player, (1), pn);\r
+#define ZC_WALKL       ScrollLeft(pip, player, 3, pn); \\r
+                               ScrollLeft(pip, player, 2, pn); \\r
+                               mapScrollLeft(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollLeft(pip, player, (1), pn);\r
+#define ZC_WALKD       ScrollDown(pip, player, 3, pn); \\r
+                               ScrollDown(pip, player, 2, pn); \\r
+                               mapScrollDown(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollDown(pip, player, (1), pn);\r
+#define ZC_WALKU       ScrollUp(pip, player, 3, pn); \\r
+                               ScrollUp(pip, player, 2, pn); \\r
+                               mapScrollUp(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollUp(pip, player, (1), pn);\r
 \r
 void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
 {\r
@@ -42,12 +58,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollRight(pip, player, 3, pn);\r
-                                       ScrollRight(pip, player, 2, pn);\r
-                                                                       mapScrollRight(pip, player, (0), pn);\r
-                                       if(pip[0].video->bgps)  mapScrollRight(pip, player, (1), pn);\r
+                                       ZC_animatePlayer(pip, player, pn, 2);\r
+                                       ZC_WALKR\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
@@ -57,16 +69,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.x+=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn, 1);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn, 0);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx+1;\r
@@ -80,12 +91,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollLeft(pip, player, 3, pn);\r
-                                       ScrollLeft(pip, player, 2, pn);\r
-                                                                       mapScrollLeft(pip, player, (0), pn);\r
-                                       if(pip[0].video->bgps)  mapScrollLeft(pip, player, (1), pn);\r
+                                       ZC_animatePlayer(pip, player, pn, 2);\r
+                                       ZC_WALKL\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
@@ -95,16 +102,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.x-=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn, 1);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn, 0);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx-1;\r
@@ -118,12 +124,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollDown(pip, player, 3, pn);\r
-                                       ScrollDown(pip, player, 2, pn);\r
-                                                                       mapScrollDown(pip, player, (0), pn);\r
-                                       if(pip[0].video->bgps)  mapScrollDown(pip, player, (1), pn);\r
+                                       ZC_animatePlayer(pip, player, pn, 2);\r
+                                       ZC_WALKD\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
@@ -133,16 +135,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.y+=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn, 1);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn, 0);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
@@ -156,12 +157,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollUp(pip, player, 3, pn);\r
-                                       ScrollUp(pip, player, 2, pn);\r
-                                                                       mapScrollUp(pip, player, (0), pn);\r
-                                       if(pip[0].video->bgps)  mapScrollUp(pip, player, (1), pn);\r
+                                       ZC_animatePlayer(pip, player, pn, 2);\r
+                                       ZC_WALKU\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
@@ -171,16 +168,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.y-=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn, 1);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn, 0);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
@@ -347,6 +343,8 @@ initMap(map_t *map) {
        }\r
 }\r
 \r
+//===========================================================================//\r
+\r
 \r
 void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
 {\r
@@ -406,7 +404,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
        if(player[plid].enti.q==4)\r
 #endif\r
 //             if(id==0)\r
-                       mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWCOLNUM);\r
+                       mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWROWNUM);\r
 //             else\r
 //                     if(mv[0].video->bgps)\r
 //                             modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
@@ -428,14 +426,48 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
        if(player[plid].enti.q==4)\r
 #endif\r
 //             if(id==0)\r
-                       mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWCOLNUM);\r
+                       mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWROWNUM);\r
 //             else\r
 //                     if(mv[0].video->bgps)\r
 //                             modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
        mv[0].video->r=1;\r
 }\r
 \r
-\r
+void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)\r
+{\r
+       word b = mv[0].video->bgps;\r
+       switch(player[pn].enti.d)\r
+       {\r
+               case 2://none\r
+               break;\r
+               case 3://right\r
+                               ScrollRight(mv, player, 3, pn);\r
+                               ScrollRight(mv, player, 2, pn);\r
+                               mapScrollRight(mv, player, (0), pn);\r
+                       if(b)   mapScrollRight(mv, player, (1), pn);\r
+               break;\r
+               case 4://left\r
+                               ScrollLeft(mv, player, 3, pn);\r
+                               ScrollLeft(mv, player, 2, pn);\r
+                               mapScrollLeft(mv, player, (0), pn);\r
+                       if(b)   mapScrollLeft(mv, player, (1), pn);\r
+               break;\r
+               case 1://down\r
+                               ScrollDown(mv, player, 3, pn);\r
+                               ScrollDown(mv, player, 2, pn);\r
+                               mapScrollDown(mv, player, (0), pn);\r
+                       if(b)   mapScrollDown(mv, player, (1), pn);\r
+               break;\r
+               case 0://up\r
+                               ScrollUp(mv, player, 3, pn);\r
+                               ScrollUp(mv, player, 2, pn);\r
+                               mapScrollUp(mv, player, (0), pn);\r
+                       if(b)   mapScrollUp(mv, player, (1), pn);\r
+               break;\r
+       }\r
+       printf("player[pn].enti.d=%u\n", player[pn].enti.d);\r
+       mv->video->r=1;\r
+}\r
 \r
 //===========================================================================\r
 //TODO: put player in starting position of assigned spot on map\r
@@ -661,17 +693,7 @@ void shinku(global_game_variables_t *gv)
 {\r
        word x = (0) + gv->video.page[/*!*/(gv->video.p)].dx; // follow the screen\r
        word y = (0) + gv->video.page[/*!*/(gv->video.p)].dy; // follow the screen\r
-       word col = 2, bgcol = 1, type = 1;//w = 64, h = 8, //col7bgcol0\r
-       //byte o,o2,i;\r
-       //modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);\r
-       /* block copy to visible RAM from offscreen */\r
-//     vga_setup_wm1_block_copy();\r
-//     modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x+w, 0, w, h);\r
-//     o =     *(gv->video.page[2].data); // source offscreen\r
-//     o2 =    *(gv->video.page[gv->video->sfip].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)\r
-//     for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
-       /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */\r
-//     vga_restore_rm0wm0();\r
+       word col = 2, bgcol = 1, type = 1;//w = 64, h = 8,\r
        if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
        {\r
         // NTS: For some bizarre reason, gv->pee is not initialized, but the pointer is not NULL even\r
@@ -682,29 +704,20 @@ void shinku(global_game_variables_t *gv)
         //\r
         //      This fixes *** Null pointer assignment detected error message in ZCROLL.EXE on exit.\r
                sprintf(global_temp_status_text, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv));\r
-               //modexClearRegion(&(gv->video.page[gv->video->sfip]), x, y, w, h, 45);\r
                modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);\r
                gv->kurokku.tiku=0;\r
-               /* block copy to visible RAM from offscreen */\r
-//             vga_setup_wm1_block_copy();\r
-//             o =     *(gv->video.page[gv->video->sfip].data); // source offscreen\r
-//             o2 =    *(gv->video.page[2].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)\r
-//             for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
-//             modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x, 0, w, h);\r
-               /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */\r
-//             vga_restore_rm0wm0();\r
        }else //copy dat sheet\r
        gv->kurokku.tiku++;\r
 \r
        switch(gv->kurokku.fpscap)\r
        {\r
                case 0:\r
-                       //modexprint(&(gv->video.page[gv->video->sfip]), x, y+8, type, col, bgcol, "sanic!");\r
+                       modexprint(&(gv->video.page[0]), x, y+8, type, col, bgcol, "sanic!");\r
                        gv->kurokku.frames_per_second=1;\r
                break;\r
                case 1:\r
                        //turn this off if XT\r
-                       //modexWaitBorder();\r
+                       modexWaitBorder_start();\r
                        //vga_wait_for_vsync();\r
                        gv->kurokku.frames_per_second=60;\r
                break;\r
@@ -725,121 +738,6 @@ void shinku(global_game_variables_t *gv)
        }\r
 }\r
 \r
-void near ZC_drawframe(map_view_t *pip, entity_t *enti, sword x, sword y)\r
-{\r
-       switch(pip[0].video->rss)\r
-       {\r
-               case 0:\r
-                       animate_spri(enti, pip->video);\r
-               break;\r
-               case 1:\r
-                       animate_spri(enti, pip->video);\r
-               break;\r
-//             case 2:\r
-//                     modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, player[pn].enti.dire);\r
-//             break;\r
-       }\r
-}\r
-\r
-#ifdef SPRITE\r
-#define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#define FRAME3 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 0, player[pn].enti.dire, 24, 32,    PLAYERBMPDATAPTR);\r
-#define FRAME4 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#else\r
-#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+player[pn].enti.dire);\r
-#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
-#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, player[pn].enti.dire);\r
-#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
-#endif\r
-\r
-void 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
-       sword bx = x+16;        //buffer's x\r
-       sword by = y+16;        //buffer's y\r
-       sword qq; //scroll offset\r
-       word ls = 0;//player[pn].enti.persist_aniframe;\r
-       player[pn].enti.dire=32; //direction\r
-\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
-       //x-=4;\r
-       y-=pip[0].map->tiles->tileHeight;\r
-       switch (player[pn].enti.d)\r
-       {\r
-               case 0:\r
-                       //up\r
-                       player[pn].enti.dire*=player[pn].enti.d;\r
-                       y-=qq;\r
-                       by-=4;\r
-               break;\r
-               case 3:\r
-                       // right\r
-                       player[pn].enti.dire*=(player[pn].enti.d-2);\r
-                       x+=qq;\r
-                       bx+=4;\r
-               break;\r
-               case 2:\r
-               break;\r
-               case 4:\r
-                       //down\r
-                       player[pn].enti.dire*=(player[pn].enti.d-2);\r
-                       y+=qq;\r
-                       by+=4;\r
-               break;\r
-               case 1:\r
-                       //left\r
-                       player[pn].enti.dire*=(player[pn].enti.d+2);\r
-                       x-=qq;\r
-                       bx-=4;\r
-               break;\r
-       }\r
-\r
-//     if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);\r
-//     else{\r
-//             //copy old bg to page0\r
-//             //modexCopyPageRegion(pip[3].page, pip[0].page, bx, by, 0, 0,   20, 36);\r
-//             //update buffer\r
-//             //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,   x, y,   20, 36);\r
-//     }\r
-//modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);\r
-       //modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);\r
-       /*modexCopyPageRegion(pip[pip->video->p].page,\r
- pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36);*/\r
-//     else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40);\r
-       switch(ls)\r
-       {\r
-               case 1:\r
-                       FRAME1\r
-               break;\r
-               case 2:\r
-                       FRAME2\r
-               break;\r
-               case 3:\r
-                       FRAME3\r
-               break;\r
-               case 4:\r
-                       FRAME4\r
-               break;\r
-       }\r
-//     if(2>ls && ls>=1) { FRAME1 }else\r
-//     if(3>ls && ls>=2) { FRAME2 }else\r
-//     if(4>ls && ls>=3) { FRAME3 }else\r
-//     if(5>ls && ls>=4) { FRAME4 }\r
-       //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 24, 32);\r
-       //printf("x=%d  y=%d    bx=%d           by=%d\n", x, y, bx, by);\r
-       pip->video->r=1;\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
@@ -903,7 +801,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
        if(pip[0].video->bgps)\r
                modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40);\r
        //draw sprite\r
-       ZC_drawframe(pip, &player[pn].enti, x, y);\r
+       animate_spri(&player[pn].enti, pip->video);\r
 //0000if(player[pn].enti.q<2) delay(200);\r
        pip->video->r=1;\r
 }\r
@@ -996,6 +894,4 @@ void mapScroll(map_view_t *mv, player_t *player)
                default:\r
                        break;\r
        }\r
-\r
-       mv->video->r=1;\r
 }\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index bed922b1d09d5a0644b1675fd5ea7c6af9707012..c789cc1ad3ce41afea0fe2dcafc500001be61b47 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -44,8 +44,6 @@
 #define SPRITE\r
 //#define TILERENDER\r
 \r
-#define ANIMATESPRIFUN ZC_animatePlayer\r
-\r
 #define PLAYERBMPDATAVAR       player[pn].data\r
 #define PLAYERBMPDATA          *PLAYERBMPDATAVAR\r
 #define PLAYERBMPDATAPTR       PLAYERBMPDATAVAR\r
@@ -57,7 +55,7 @@
 //row and colum drawing routines\r
 #define FULLRCREND\r
 #define DRAWCOLNUM mv->page[id].dx\r
-#define DRAWROLNUM mv->page[id].dy\r
+#define DRAWROWNUM mv->page[id].dy\r
 //#define DRAWCOLNUM player[plid].enti.q\r
 //#define DRAWROLNUM player[plid].enti.q\r
 \r
@@ -72,15 +70,15 @@
 //not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
 //printf("mv[%u].tx: %d", gvar.video.panp, mv[gvar.video.panp].tx); printf("   mv[%u].ty: %d   ", gvar.video.panp, mv[gvar.video.panp].ty);\r
 //printf("gvar.kurokku:        "); printf("%.0f ", clock());   printf("tiku=%lu ", gvar.kurokku.tiku); printf("t=%.0f ", gvar.kurokku.t);      printf("ticktock()=%f ", ticktock(&gvar));      printf("%.0f fps", (double)gvar.kurokku.tiku/ticktock(&gvar));\r
-//printf("map.width=%d map.height=%d   map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);\r
+//printf("map.width=%d map.height=%d   map.data[0]=%d\n", mv[1].map->width, mv[1].map->height, mv[1].map->data[0]);\r
 //printf("pageflipflop=%u", pageflipflop);\r
 //printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);\r
 //printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);   printf("%d\n", gvar.video.page[0].tilemidposscreeny);\r
 //printf("     aniframe=%u", player[0].enti.persist_aniframe);\r
-#define SCROLLEXITMESG         printf("[0]txy: %dx%d   ", mv[0].tx, mv[0].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\\r
+#define SCROLLEXITMESG         printf("[0]txy: %dx%d   ", mv[1].tx, mv[1].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\\r
        printf("\n\n");\\r
        printf("player vars:\n");\\r
-       printf("        xy: %dx%d", player[0].enti.x, player[0].enti.y); printf("       txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf("    triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf("    value: %d\n", mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\\r
+       printf("        xy: %dx%d", player[0].enti.x, player[0].enti.y); printf("       txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf("    triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf("    value: %d\n", mv[1].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\\r
        printf("        hp: %d", (player[0].enti.hp));  printf("        q: %d", player[0].enti.q);      printf("        info.dir: %d", player[0].info.dir);     printf("        d: %d ", player[0].enti.d);\\r
                printf("        pdir: %d\n", player[0].pdir); printf("  delay=%u", player[0].enti.spri->delay);\\r
 printf("\n\n");\\r
@@ -97,7 +95,6 @@ extern char global_temp_status_text[512];
 //map_t allocMap(int w, int h);\r
 void initMap(map_t *map);\r
 void ZC_walk(map_view_t *pip, player_t *player, word pn);\r
-//void oldwalk(map_view_t *pip, player_t *player, word pn);\r
 void ZC_panPageManual(map_view_t *pip, player_t *player, word pn);\r
 void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv);\r
 void ZC_MVInit(map_view_t *pip, int tx, int ty);\r
@@ -106,6 +103,16 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid);
 void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid);\r
 void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid);\r
 void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);\r
+void ZC_mapScroll(map_view_t *mv, player_t *player, word pn);\r
+void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn);\r
+sword chkmap(map_t *map, word q);\r
+void mapGoTo(map_view_t *mv, int tx, int ty);\r
+void ZC_mapinitMV(map_view_t *mv, int tx, int ty);\r
+void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
+void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset);\r
+void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset);\r
+void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);\r
+void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
 inline void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
 {\r
        /* increment the pixel position and update the page */\r
@@ -174,19 +181,10 @@ inline void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid
        }\r
 }\r
 \r
-void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn);\r
-sword chkmap(map_t *map, word q);\r
-void mapGoTo(map_view_t *mv, int tx, int ty);\r
-void ZC_mapinitMV(map_view_t *mv, int tx, int ty);\r
-void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
-void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset);\r
-void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset);\r
-void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);\r
-void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
 //void qclean();\r
+//sync\r
 void shinku(global_game_variables_t *gv);\r
-void near ZC_drawframe(map_view_t *pip, entity_t *enti, sword x, sword y);\r
-void animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
+//animate the sprite\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 \r
 // Move an entity around. Should actually be in 16_entity\r

diff --git a/src/zcroll.c b/src/zcroll.c
index 72b6fcea048679037ecfb6cf1153016d53338752..582920ce324f65946332d2d4a228af2d1f159246 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -212,7 +212,7 @@ void main(int argc, char *argv[])
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r
-               if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break; //incase things go out of sync!\r
+               if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;  //incase things go out of sync!\r
        }\r
 \r
        /* fade back to text mode */\r
@@ -222,7 +222,6 @@ void main(int argc, char *argv[])
        modexSavePalFile("data/g.pal", gpal);\r
        modexFadeOff(4, gpal);\r
 #endif\r
-       VGAmodeX(0, 1, &gvar);\r
        Shutdown16(&gvar);\r
        printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r