how is this still broken?

diff --git a/ZCROLL.L16 b/ZCROLL.L16
deleted file mode 100755 (executable)
index febfef5..0000000
--- a/ZCROLL.L16
+++ /dev/null
@@ -1,34 +0,0 @@
-objects detected\r
-Object 4's name: 'trunk'\r
-       properties: {\r
-                     "walkable":"0"\r
-                    }\r
-               walkable: 0\r
-Object 4's name: 'stump'\r
-       properties: {\r
-                     "walkable":"0"\r
-                    }\r
-               walkable: 0\r
-\r
-Project 16 zcroll.exe. This is just a test file!\r
-version Mar 13 2017 12:20:24\r
-page[0]dxy: 16x16\r
-\r
-player vars:\r
-       xy: 160x128     txy: 10x8       triggxy: 10x9   value: 39\r
-       hp: 4   q: 1    info.dir: 2     d: 2    dire: 30        pdir: 0\r
-       delay=0\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:0000) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
-       [1]=(a000:5d80) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
-       [2]=(a000:bb00) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
-       [3]=(a000:dc00) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
-gvar.video:\r
- r=0 bgps=1 \r
-\r
-detected CPU type: 80386 or newer\r
-detected FPU type: 80387\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 6bd889fddd4b1b77447c0b72b4f51ccdb932380b..bb190511a2125edf7ff9a728ab2c9e5149e3fca0 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -55,14 +55,14 @@
 #define TAIL_PANKEYFUNZC \\r
        ZC_panPageManual(&gvar.mv, &gvar.player, 0);\r
 \r
-#define FUNCTIONKEYSHOWMV \\r
+#define TAIL_FUNCTIONKEYSHOWMV \\r
        if(IN_KeyDown(1+1)){ gvar.video.sp=0; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
        if(IN_KeyDown(2+1)){ gvar.video.sp=1; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
        if(IN_KeyDown(3+1)){ gvar.video.sp=2; ZC_ShowMV(&gvar.mv, 0, 1); } \\r
        if(IN_KeyDown(4+1)){ gvar.video.sp=3; ZC_ShowMV(&gvar.mv, 0, 1); }\r
 \r
 #define TAIL_FUNCTIONKEYDRAWJUNK \\r
-       FUNCTIONKEYSHOWMV \\r
+       TAIL_FUNCTIONKEYSHOWMV \\r
        TAIL_FUNCTIONKEYDRAWJUNKNOMV\r
 \r
 #define TAIL_FUNCTIONKEYDRAWJUNKNOMV \\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 8a7cbb7ea744e68b91e2fc6622591dfea9deb09e..7f146fe4c00f513b25a8e2dc6f4c537a24bd7b68 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -79,7 +79,7 @@
 //printf("mv[0]txy: %dx%d      ", mv[0].tx, mv[0].ty); printf("mv[1]txy: %dx%d", mv[1].tx, mv[1].ty);\r
 #define SCROLLEXITMESG         printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\\r
        printf("\n\n");\\r
-       printf("player vars:\n");\\r
+       printf("gvar.player vars:\n");\\r
        printf("        xy: %dx%d", gvar.player[0].enti.x, gvar.player[0].enti.y); printf("     txy: %dx%d", gvar.player[0].enti.tx, gvar.player[0].enti.ty); printf("  triggxy: %dx%d", gvar.player[0].enti.triggerx, gvar.player[0].enti.triggery); printf("  value: %d\n", gvar.mv[1].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))]);\\r
        printf("        hp: %d", (gvar.player[0].enti.hp));     printf("        q: %u", gvar.player[0].enti.q); printf("        info.dir: %u", gvar.player[0].info.dir);        printf("        d: %u", gvar.player[0].enti.d); printf("        dire: %u", gvar.player[0].enti.dire);\\r
                printf("        pdir: %u\n", gvar.player[0].pdir); printf("     delay=%u", gvar.player[0].enti.spri.delay);\\r

diff --git a/src/lib/testpatt.h b/src/lib/testpatt.h
index bd73e577e492eb0b6722f8368897111ef0ce0e7a..0b9086183aae20316cb09a7efdb209c4472fc880 100755 (executable)
--- a/src/lib/testpatt.h
+++ b/src/lib/testpatt.h
@@ -68,16 +68,16 @@ DRAWOTHERCORNERBOX_BOTTOMLEFT; \
 DRAWOTHERCORNERBOX_BOTTOMRIGHT;\r
 \r
 #define TESTBG1 \\r
-       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1); \\r
-       modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 2); \\r
-       modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 3); \\r
-       modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 2);\r
+       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15); \\r
+       modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128); \\r
+       modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42); \\r
+       modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);\r
 \r
 #define TESTBG2 \\r
-       modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 5); \\r
-       modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 6); \\r
-       modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 7); \\r
-       modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 6);\r
+       modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 20); \\r
+       modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 133); \\r
+       modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 47); \\r
+       modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 133);\r
 \r
 #define TESTBG12 \\r
        TESTBG1 \\r