From abccd3876665e8f6644ff29b7b008686b756b61f Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 13 Mar 2017 12:31:04 -0500 Subject: [PATCH 1/1] how is this still broken? --- ZCROLL.L16 | 34 ---------------------------------- src/lib/16_tail.h | 4 ++-- src/lib/scroll16.h | 2 +- src/lib/testpatt.h | 16 ++++++++-------- 4 files changed, 11 insertions(+), 45 deletions(-) delete mode 100755 ZCROLL.L16 diff --git a/ZCROLL.L16 b/ZCROLL.L16 deleted file mode 100755 index febfef5e..00000000 --- a/ZCROLL.L16 +++ /dev/null @@ -1,34 +0,0 @@ -objects detected -Object 4's name: 'trunk' - properties: { - "walkable":"0" - } - walkable: 0 -Object 4's name: 'stump' - properties: { - "walkable":"0" - } - walkable: 0 - -Project 16 zcroll.exe. This is just a test file! -version Mar 13 2017 12:20:24 -page[0]dxy: 16x16 - -player vars: - xy: 160x128 txy: 10x8 triggxy: 10x9 value: 39 - hp: 4 q: 1 info.dir: 2 d: 2 dire: 30 pdir: 0 - delay=0 - -VL_PrintmodexmemInfo: - Virtual Screen: 352x272 Tile: 22x17=((Virtual Screen)/16) - Screen: 320x240 Tile: 20x15=((Screen)/16) - Free Video Memory: 767 - page [0]=(a000:0000) size=23936 w=352 h=272 sw=320 sh=240 pi=1408 - [1]=(a000:5d80) size=23936 w=352 h=272 sw=320 sh=240 pi=1408 - [2]=(a000:bb00) size=8448 w=352 h=96 sw=352 sh=96 pi=1408 - [3]=(a000:dc00) size=8448 w=352 h=96 sw=352 sh=96 pi=1408 -gvar.video: - r=0 bgps=1 - -detected CPU type: 80386 or newer -detected FPU type: 80387 diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h index 6bd889fd..bb190511 100755 --- a/src/lib/16_tail.h +++ b/src/lib/16_tail.h @@ -55,14 +55,14 @@ #define TAIL_PANKEYFUNZC \ ZC_panPageManual(&gvar.mv, &gvar.player, 0); -#define FUNCTIONKEYSHOWMV \ +#define TAIL_FUNCTIONKEYSHOWMV \ if(IN_KeyDown(1+1)){ gvar.video.sp=0; ZC_ShowMV(&gvar.mv, 0, 0); } \ if(IN_KeyDown(2+1)){ gvar.video.sp=1; ZC_ShowMV(&gvar.mv, 0, 0); } \ if(IN_KeyDown(3+1)){ gvar.video.sp=2; ZC_ShowMV(&gvar.mv, 0, 1); } \ if(IN_KeyDown(4+1)){ gvar.video.sp=3; ZC_ShowMV(&gvar.mv, 0, 1); } #define TAIL_FUNCTIONKEYDRAWJUNK \ - FUNCTIONKEYSHOWMV \ + TAIL_FUNCTIONKEYSHOWMV \ TAIL_FUNCTIONKEYDRAWJUNKNOMV #define TAIL_FUNCTIONKEYDRAWJUNKNOMV \ diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index 8a7cbb7e..7f146fe4 100755 --- 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); #define SCROLLEXITMESG printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\ printf("\n\n");\ - printf("player vars:\n");\ + printf("gvar.player vars:\n");\ 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))]);\ 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);\ printf(" pdir: %u\n", gvar.player[0].pdir); printf(" delay=%u", gvar.player[0].enti.spri.delay);\ diff --git a/src/lib/testpatt.h b/src/lib/testpatt.h index bd73e577..0b908618 100755 --- a/src/lib/testpatt.h +++ b/src/lib/testpatt.h @@ -68,16 +68,16 @@ DRAWOTHERCORNERBOX_BOTTOMLEFT; \ DRAWOTHERCORNERBOX_BOTTOMRIGHT; #define TESTBG1 \ - modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1); \ - modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 2); \ - modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 3); \ - modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 2); + modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15); \ + modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128); \ + modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42); \ + modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128); #define TESTBG2 \ - modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 5); \ - modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 6); \ - modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 7); \ - modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 6); + modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 20); \ + modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 133); \ + modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 47); \ + modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 133); #define TESTBG12 \ TESTBG1 \ -- 2.39.2