From e6a3783f754943844abac31b5b6ca3d424741173 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 27 Feb 2017 15:45:13 -0600 Subject: [PATCH 1/1] shapetest ported and i have no idea what it dose --- DEBUG.16W | 220 +++++++++++++++++++++++------------------------ HEAP.16W | 42 ++++----- MMDUMP.16W | Bin 2550 -> 2550 bytes makefile | 4 +- src/exmmtest.c | 2 + src/lib/16_dbg.c | 213 ++++++++++++++++++++++++++++++++++++++++++++- src/lib/16_dbg.h | 3 + 7 files changed, 349 insertions(+), 135 deletions(-) diff --git a/DEBUG.16W b/DEBUG.16W index f401ae96..18505d71 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -Seg:0 Size:8973 Owner:0x0 +Seg:0 Size:9008 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0000 -Seg:23fe Size:39 Owner:0x0 -+ -Seg:2425 Size:256 Owner:0x1dc4 +Seg:2421 Size:39 Owner:0x0 +++ +Seg:2448 Size:256 Owner:0x1dc4 ++++ -Seg:2525 Size:256 Owner:0x1bb6 -+++++ -Seg:2625 Size:256 Owner:0x1bb8 -++++ -Seg:2725 Size:256 Owner:0x1bba +Seg:2548 Size:256 Owner:0x1bb6 ++++ -Seg:2825 Size:256 Owner:0x1bbc +Seg:2648 Size:256 Owner:0x1bb8 ++++ -Seg:2925 Size:256 Owner:0x1bbe +Seg:2748 Size:256 Owner:0x1bba ++++ -Seg:2a25 Size:256 Owner:0x1bc0 +Seg:2848 Size:256 Owner:0x1bbc +++++ -Seg:2b25 Size:256 Owner:0x1bc2 +Seg:2948 Size:256 Owner:0x1bbe ++++ -Seg:2c25 Size:256 Owner:0x1bc4 +Seg:2a48 Size:256 Owner:0x1bc0 ++++ -Seg:2d25 Size:256 Owner:0x1bc6 +Seg:2b48 Size:256 Owner:0x1bc2 ++++ -Seg:2e25 Size:256 Owner:0x1bc8 +Seg:2c48 Size:256 Owner:0x1bc4 ++++ -Seg:2f25 Size:256 Owner:0x1bca +Seg:2d48 Size:256 Owner:0x1bc6 +++++ -Seg:3025 Size:256 Owner:0x1bcc +Seg:2e48 Size:256 Owner:0x1bc8 ++++ -Seg:3125 Size:256 Owner:0x1bce +Seg:2f48 Size:256 Owner:0x1bca ++++ -Seg:3225 Size:256 Owner:0x1bd0 +Seg:3048 Size:256 Owner:0x1bcc ++++ -Seg:3325 Size:256 Owner:0x1bd2 +Seg:3148 Size:256 Owner:0x1bce ++++ -Seg:3425 Size:256 Owner:0x1bd4 +Seg:3248 Size:256 Owner:0x1bd0 +++++ -Seg:3525 Size:256 Owner:0x1bd6 +Seg:3348 Size:256 Owner:0x1bd2 ++++ -Seg:3625 Size:256 Owner:0x1bd8 +Seg:3448 Size:256 Owner:0x1bd4 ++++ -Seg:3725 Size:256 Owner:0x1bda +Seg:3548 Size:256 Owner:0x1bd6 ++++ -Seg:3825 Size:256 Owner:0x1bdc +Seg:3648 Size:256 Owner:0x1bd8 ++++ -Seg:3925 Size:256 Owner:0x1bde +Seg:3748 Size:256 Owner:0x1bda +++++ -Seg:3a25 Size:256 Owner:0x1be0 +Seg:3848 Size:256 Owner:0x1bdc ++++ -Seg:3b25 Size:256 Owner:0x1be2 +Seg:3948 Size:256 Owner:0x1bde ++++ -Seg:3c25 Size:256 Owner:0x1be4 +Seg:3a48 Size:256 Owner:0x1be0 ++++ -Seg:3d25 Size:256 Owner:0x1be6 +Seg:3b48 Size:256 Owner:0x1be2 ++++ -Seg:3e25 Size:256 Owner:0x1be8 +Seg:3c48 Size:256 Owner:0x1be4 +++++ -Seg:3f25 Size:256 Owner:0x1bea +Seg:3d48 Size:256 Owner:0x1be6 ++++ -Seg:4025 Size:256 Owner:0x1bec +Seg:3e48 Size:256 Owner:0x1be8 ++++ -Seg:4125 Size:256 Owner:0x1bee +Seg:3f48 Size:256 Owner:0x1bea ++++ -Seg:4225 Size:256 Owner:0x1bf0 +Seg:4048 Size:256 Owner:0x1bec ++++ -Seg:4325 Size:256 Owner:0x1bf2 +Seg:4148 Size:256 Owner:0x1bee +++++ -Seg:4425 Size:256 Owner:0x1bf4 +Seg:4248 Size:256 Owner:0x1bf0 ++++ -Seg:4525 Size:256 Owner:0x1bf6 +Seg:4348 Size:256 Owner:0x1bf2 ++++ -Seg:4625 Size:256 Owner:0x1bf8 +Seg:4448 Size:256 Owner:0x1bf4 ++++ -Seg:4725 Size:256 Owner:0x1bfa +Seg:4548 Size:256 Owner:0x1bf6 ++++ -Seg:4825 Size:256 Owner:0x1bfc +Seg:4648 Size:256 Owner:0x1bf8 +++++ -Seg:4925 Size:256 Owner:0x1bfe +Seg:4748 Size:256 Owner:0x1bfa ++++ -Seg:4a25 Size:256 Owner:0x1c00 +Seg:4848 Size:256 Owner:0x1bfc ++++ -Seg:4b25 Size:256 Owner:0x1c02 +Seg:4948 Size:256 Owner:0x1bfe ++++ -Seg:4c25 Size:256 Owner:0x1c04 +Seg:4a48 Size:256 Owner:0x1c00 ++++ -Seg:4d25 Size:256 Owner:0x1c06 +Seg:4b48 Size:256 Owner:0x1c02 +++++ -Seg:4e25 Size:256 Owner:0x1c08 +Seg:4c48 Size:256 Owner:0x1c04 ++++ -Seg:4f25 Size:256 Owner:0x1c0a +Seg:4d48 Size:256 Owner:0x1c06 ++++ -Seg:5025 Size:256 Owner:0x1c0c +Seg:4e48 Size:256 Owner:0x1c08 ++++ -Seg:5125 Size:256 Owner:0x1c0e +Seg:4f48 Size:256 Owner:0x1c0a ++++ -Seg:5225 Size:256 Owner:0x1c10 +Seg:5048 Size:256 Owner:0x1c0c +++++ -Seg:5325 Size:256 Owner:0x1c12 +Seg:5148 Size:256 Owner:0x1c0e ++++ -Seg:5425 Size:256 Owner:0x1c14 +Seg:5248 Size:256 Owner:0x1c10 ++++ -Seg:5525 Size:256 Owner:0x1c16 +Seg:5348 Size:256 Owner:0x1c12 ++++ -Seg:5625 Size:256 Owner:0x1c18 +Seg:5448 Size:256 Owner:0x1c14 ++++ -Seg:5725 Size:256 Owner:0x1c1a +Seg:5548 Size:256 Owner:0x1c16 +++++ -Seg:5825 Size:256 Owner:0x1c1c +Seg:5648 Size:256 Owner:0x1c18 ++++ -Seg:5925 Size:256 Owner:0x1c1e +Seg:5748 Size:256 Owner:0x1c1a ++++ -Seg:5a25 Size:256 Owner:0x1c20 +Seg:5848 Size:256 Owner:0x1c1c ++++ -Seg:5b25 Size:256 Owner:0x1c22 +Seg:5948 Size:256 Owner:0x1c1e ++++ -Seg:5c25 Size:256 Owner:0x1c24 +Seg:5a48 Size:256 Owner:0x1c20 +++++ -Seg:5d25 Size:256 Owner:0x1c26 +Seg:5b48 Size:256 Owner:0x1c22 ++++ -Seg:5e25 Size:256 Owner:0x1c28 +Seg:5c48 Size:256 Owner:0x1c24 ++++ -Seg:5f25 Size:256 Owner:0x1c2a +Seg:5d48 Size:256 Owner:0x1c26 ++++ -Seg:6025 Size:256 Owner:0x1c2c +Seg:5e48 Size:256 Owner:0x1c28 ++++ -Seg:6125 Size:256 Owner:0x1c2e +Seg:5f48 Size:256 Owner:0x1c2a +++++ -Seg:6225 Size:256 Owner:0x1c30 +Seg:6048 Size:256 Owner:0x1c2c ++++ -Seg:6325 Size:256 Owner:0x1c32 +Seg:6148 Size:256 Owner:0x1c2e ++++ -Seg:6425 Size:256 Owner:0x1c34 +Seg:6248 Size:256 Owner:0x1c30 ++++ -Seg:6525 Size:256 Owner:0x1c36 +Seg:6348 Size:256 Owner:0x1c32 ++++ -Seg:6625 Size:256 Owner:0x1c38 +Seg:6448 Size:256 Owner:0x1c34 +++++ -Seg:6725 Size:256 Owner:0x1c3a +Seg:6548 Size:256 Owner:0x1c36 ++++ -Seg:6825 Size:256 Owner:0x1c3c +Seg:6648 Size:256 Owner:0x1c38 ++++ -Seg:6925 Size:256 Owner:0x1c3e +Seg:6748 Size:256 Owner:0x1c3a ++++ -Seg:6a25 Size:256 Owner:0x1c40 +Seg:6848 Size:256 Owner:0x1c3c ++++ -Seg:6b25 Size:256 Owner:0x1c42 +Seg:6948 Size:256 Owner:0x1c3e +++++ -Seg:6c25 Size:256 Owner:0x1c44 +Seg:6a48 Size:256 Owner:0x1c40 ++++ -Seg:6d25 Size:256 Owner:0x1c46 +Seg:6b48 Size:256 Owner:0x1c42 ++++ -Seg:6e25 Size:256 Owner:0x1c48 +Seg:6c48 Size:256 Owner:0x1c44 ++++ -Seg:6f25 Size:256 Owner:0x1c4a +Seg:6d48 Size:256 Owner:0x1c46 ++++ -Seg:7025 Size:256 Owner:0x1c4c +Seg:6e48 Size:256 Owner:0x1c48 +++++ -Seg:7125 Size:256 Owner:0x1c4e +Seg:6f48 Size:256 Owner:0x1c4a ++++ -Seg:7225 Size:256 Owner:0x1c50 +Seg:7048 Size:256 Owner:0x1c4c ++++ -Seg:7325 Size:256 Owner:0x1c52 +Seg:7148 Size:256 Owner:0x1c4e ++++ -Seg:7425 Size:256 Owner:0x1c54 +Seg:7248 Size:256 Owner:0x1c50 ++++ -Seg:7525 Size:256 Owner:0x1c56 +Seg:7348 Size:256 Owner:0x1c52 +++++ -Seg:7625 Size:256 Owner:0x1c58 +Seg:7448 Size:256 Owner:0x1c54 ++++ -Seg:7725 Size:256 Owner:0x1c5a +Seg:7548 Size:256 Owner:0x1c56 ++++ -Seg:7825 Size:256 Owner:0x1c5c +Seg:7648 Size:256 Owner:0x1c58 ++++ -Seg:7925 Size:256 Owner:0x1c5e +Seg:7748 Size:256 Owner:0x1c5a ++++ -Seg:7a25 Size:256 Owner:0x1c60 +Seg:7848 Size:256 Owner:0x1c5c +++++ -Seg:7b25 Size:256 Owner:0x1c62 +Seg:7948 Size:256 Owner:0x1c5e ++++ -Seg:7c25 Size:256 Owner:0x1c64 +Seg:7a48 Size:256 Owner:0x1c60 ++++ -Seg:7d25 Size:256 Owner:0x1c66 +Seg:7b48 Size:256 Owner:0x1c62 ++++ -Seg:7e25 Size:256 Owner:0x1c68 +Seg:7c48 Size:256 Owner:0x1c64 ++++ -Seg:7f25 Size:256 Owner:0x1c6a +Seg:7d48 Size:256 Owner:0x1c66 +++++ -Seg:8025 Size:256 Owner:0x1c6c +Seg:7e48 Size:256 Owner:0x1c68 ++++ -Seg:8125 Size:256 Owner:0x1c6e +Seg:7f48 Size:256 Owner:0x1c6a ++++ -Seg:8225 Size:256 Owner:0x1c70 +Seg:8048 Size:256 Owner:0x1c6c ++++ -Seg:8325 Size:256 Owner:0x1c72 +Seg:8148 Size:256 Owner:0x1c6e ++++ -Seg:8425 Size:256 Owner:0x1c74 +Seg:8248 Size:256 Owner:0x1c70 +++++ -Seg:8525 Size:256 Owner:0x1c76 +Seg:8348 Size:256 Owner:0x1c72 ++++ -Seg:8625 Size:256 Owner:0x1c78 +Seg:8448 Size:256 Owner:0x1c74 ++++ -Seg:8725 Size:256 Owner:0x1c7a +Seg:8548 Size:256 Owner:0x1c76 ++++ -Seg:8825 Size:256 Owner:0x1c7c +Seg:8648 Size:256 Owner:0x1c78 ++++ -Seg:8925 Size:273 Owner:0x1b88 -+++++ -Seg:9d64 Size:25243 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file +Seg:8748 Size:256 Owner:0x1c7a ++++++ +Seg:8848 Size:256 Owner:0x1c7c +++++ +Seg:8948 Size:273 Owner:0x1b88 +++++ +Seg:9d87 Size:25208 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index e4332ea9..2146b9f6 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,35 +1,35 @@ == default == - USED block at 24200016 of size 26 - USED block at 24200030 of size 26 - FREE block at 2420004a of size 38914 - USED block at 2420984c of size 136 - USED block at 242098d4 of size 20 - FREE block at 242098e8 of size 7972 + USED block at 24430016 of size 26 + USED block at 24430030 of size 26 + FREE block at 2443004a of size 38914 + USED block at 2443984c of size 136 + USED block at 244398d4 of size 20 + FREE block at 244398e8 of size 7972 OK - end of heap == near == - USED block at 141fece6 of size 12 - USED block at 141fecf2 of size 332 - USED block at 141fee3e of size 52 - USED block at 141fee72 of size 20 - USED block at 141fee86 of size 20 - USED block at 141fee9a of size 20 - USED block at 141feeae of size 20 - USED block at 141feec2 of size 20 - USED block at 141feed6 of size 4390 + USED block at 1442ece6 of size 12 + USED block at 1442ecf2 of size 332 + USED block at 1442ee3e of size 52 + USED block at 1442ee72 of size 20 + USED block at 1442ee86 of size 20 + USED block at 1442ee9a of size 20 + USED block at 1442eeae of size 20 + USED block at 1442eec2 of size 20 + USED block at 1442eed6 of size 4390 OK - end of heap == far == - USED block at 24200016 of size 26 - USED block at 24200030 of size 26 - USED block at 2420004a of size 38914 - USED block at 2420984c of size 136 - USED block at 242098d4 of size 20 - USED block at 242098e8 of size 7972 + USED block at 24430016 of size 26 + USED block at 24430030 of size 26 + USED block at 2443004a of size 38914 + USED block at 2443984c of size 136 + USED block at 244398d4 of size 20 + USED block at 244398e8 of size 7972 OK - end of heap Memory Type Total Used Free diff --git a/MMDUMP.16W b/MMDUMP.16W index 4c1c8fe9edd4b1517cdc2f85946d98ddcf695252..0eabe16dfa9930e8c235ab0999591d9161fcfecb 100755 GIT binary patch literal 2550 zcmZ|RJxWAD5QR}=!N487a0~|e{|$nBa0^a#_ZnQjCW677_~TNXtkQQ%WxnV8?RH$Q zuW!f4(erJ*Jg2{KAIIhM=~4JyJPuz9p|B7lDHMgKAVH3V zN0uYYk>$v8WI3`NS&l46k)y~_b>$0^4t$0^4t$0^4N M$Bf_O*MC3U4-4K3n*aa+ literal 2550 zcmZ|RJxWAD5QR}=!N487a0~|e{|$nBa0^a#_ZnQjCW677_~TNXtkQQ%WxnV8?RH$Q zuW!f4(R0r)&*?AR$8q_5dK7*akHeQjC@h3X3PqtQ$Psdc93e-@G3A(YOgW|;Q;sRe zlw-=V$v8WI3`NS&l46mLtnid8W5{vJamsPZamsPZamsPR MG2{36_1_Qo14r}+YXATM diff --git a/makefile b/makefile index 5ebf3d5c..5c1c9cca 100755 --- a/makefile +++ b/makefile @@ -241,7 +241,7 @@ test0.exe: test0.$(OBJ) fonttest.exe: fonttest.$(OBJ) gfx.lib #fonttes0.exe: fonttes0.$(OBJ) $(16LIB) fontgfx.exe: fontgfx.$(OBJ) gfx.lib $(DOSLIB) -inputest.exe: inputest.$(OBJ) $(16LIB) $(DOSLIB) +inputest.exe: inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib #sountest.exe: sountest.$(OBJ) $(16LIB) pcxtest.exe: pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB) vrstest.exe: vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB) @@ -254,7 +254,7 @@ pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib $(DOSLIB) maptest.exe: maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB) fmemtest.exe: fmemtest.$(OBJ) exmmtest.exe: exmmtest.$(OBJ) $(16LIB) $(DOSLIB) -vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) +vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) gfx.lib db.exe: db.$(OBJ) wcpu.exe: wcpu.$(OBJ) $(16LIB) $(DOSLIB) diff --git a/src/exmmtest.c b/src/exmmtest.c index b6efd4eb..c4fcebdf 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -221,6 +221,8 @@ PRINTBB; printf("\n\npress any key to continue!\n"); getch(); printf("press any key to continue!\n"); getch(); #endif #endif //filereadload + //getch(); ShapeTest (&gvar); + DebugMemory_(&gvar, 1); MM_DumpData(&gvar); MM_Report_(&gvar); diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c index bfa55a53..2cc7e985 100755 --- a/src/lib/16_dbg.c +++ b/src/lib/16_dbg.c @@ -17,7 +17,216 @@ boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0,dbg_nointest=0; boolean dbg_maptext=0; byte *dbg_mapdata; #endif -#endif +#endif //debug + +/* +================ += += ShapeTest += +================ +*/ + +#pragma warn -pia +void ShapeTest (global_game_variables_t *gvar) +{ +extern word NumDigi; +extern word _seg *DigiList; +static char buf[10]; + + boolean done; + ScanCode scan=0; + int i,j; +// dword l; word k,x; + memptr addr; + PageListStruct far *page; + +// CenterWindow(20,16); +// VW_UpdateScreen(); + for (i = 0,done = false;!done;) + { +// US_ClearWindow(); +// sound = -1; + + page = &(gvar->pm.PMPages[i]); +// US_Print(" Page #"); +// US_PrintUnsigned(i); + printf(" Page #%u", i); + if (i < (gvar->pm.fi.PMSpriteStart)) +// US_Print(" (Wall)"); + printf(" (Wall)"); + else if (i < (gvar->pm.fi.PMSoundStart)) +// US_Print(" (Sprite)"); + printf(" (Sprite)"); + else if (i == (gvar->pm.fi.ChunksInFile - 1)) +// US_Print(" (Sound Info)"); + printf(" (Sound Info)"); + else +// US_Print(" (Sound)"); + printf(" (Sound)"); + +// US_Print("\n XMS: "); + printf("\n XMS: "); + if (page->xmsPage != -1) +// US_PrintUnsigned(page->xmsPage); + printf("%u", page->xmsPage); + else +// US_Print("No"); + printf("No"); + +// US_Print("\n Main: "); + if (page->mainPage != -1) +// US_PrintUnsigned(page->mainPage); + printf("\n Main: %u", page->mainPage); + else if (page->emsPage != -1) + { +// US_Print("EMS "); +// US_PrintUnsigned(page->emsPage); + printf("EMS %u", page->emsPage); + } + else +// US_Print("No"); + printf("No"); + +// US_Print("\n Last hit: "); +// US_PrintUnsigned(page->lastHit); + printf("\n Last hit: %u", page->lastHit); + +// US_Print("\n Address: "); + printf("\n Address: "); + addr = PM_GetPageAddress(i, gvar); + sprintf(buf,"0x%04x",(word)addr); +// US_Print(buf); + printf("%s", buf); + + if (addr) + { +/* if (i < PMSpriteStart) + { + // + // draw the wall + // + bufferofs += 32*SCREENWIDTH; + postx = 128; + postwidth = 1; + postsource = ((long)((unsigned)addr))<<16; + for (x=0;x<64;x++,postx++,postsource+=64) + { + wallheight[postx] = 256; + FarScalePost (); + } + bufferofs -= 32*SCREENWIDTH; + } + else if (i < PMSoundStart) + { + // + // draw the sprite + // + bufferofs += 32*SCREENWIDTH; + SimpleScaleShape (160, i-PMSpriteStart, 64); + bufferofs -= 32*SCREENWIDTH; + } + else if (i == ChunksInFile - 1) + { + US_Print("\n\n Number of sounds: "); + US_PrintUnsigned(NumDigi); + for (l = j = k = 0;j < NumDigi;j++) + { + l += DigiList[(j * 2) + 1]; + k += (DigiList[(j * 2) + 1] + (PMPageSize - 1)) / PMPageSize; + } + US_Print("\n Total bytes: "); + US_PrintUnsigned(l); + US_Print("\n Total pages: "); + US_PrintUnsigned(k); + } + else + { + byte far *dp = (byte far *)MK_FP(addr,0); + for (j = 0;j < NumDigi;j++) + { + k = (DigiList[(j * 2) + 1] + (PMPageSize - 1)) / PMPageSize; + if + ( + (i >= PMSoundStart + DigiList[j * 2]) + && (i < PMSoundStart + DigiList[j * 2] + k) + ) + break; + } + if (j < NumDigi) + { +// sound = j; + US_Print("\n Sound #"); + US_PrintUnsigned(j); + US_Print("\n Segment #"); + US_PrintUnsigned(i - PMSoundStart - DigiList[j * 2]); + } + for (j = 0;j < page->length;j += 32) + { + byte v = dp[j]; + int v2 = (unsigned)v; + v2 -= 128; + v2 /= 4; + if (v2 < 0) + VWB_Vlin(WindowY + WindowH - 32 + v2, + WindowY + WindowH - 32, + WindowX + 8 + (j / 32),BLACK); + else + VWB_Vlin(WindowY + WindowH - 32, + WindowY + WindowH - 32 + v2, + WindowX + 8 + (j / 32),BLACK); + } + }*/ + printf("addr ok\n"); + } + +// VW_UpdateScreen(); + +// while (!(scan = LastScan)) +// SD_Poll(); + + IN_ClearKey(scan); + switch (scan) + { + case sc_LeftArrow: + if (i) + i--; + break; + case sc_RightArrow: + if (++i >= (gvar->pm.fi.ChunksInFile)) + i--; + break; + case sc_W: // Walls + i = 0; + break; + case sc_S: // Sprites + i = (gvar->pm.fi.PMSpriteStart); + break; + case sc_D: // Digitized + i = (gvar->pm.fi.PMSoundStart); + break; + case sc_I: // Digitized info + i = (gvar->pm.fi.ChunksInFile - 1); + break; + case sc_L: // Load all pages + for (j = 0;j < (gvar->pm.fi.ChunksInFile);j++) + PM_GetPage(j, gvar); + break; + case sc_P: +// if (sound != -1) +// SD_PlayDigitized(sound); + break; + case sc_Escape: + done = true; + break; + case sc_Enter: + PM_GetPage(i, gvar); + break; + } + } + //SD_StopDigitized(); +} +#pragma warn +pia #ifdef __WATCOMC__ // TODO: Could we also provide a build mode to emit debug to the "Bochs E9 hack?" @@ -91,5 +300,5 @@ void _DEBUGF(const char *fmt,...) { _DEBUG(_DEBUGF_TMP); va_end(va); } +#endif //serial #endif //watcomc -#endif diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h index 5340313a..37062b43 100755 --- a/src/lib/16_dbg.h +++ b/src/lib/16_dbg.h @@ -3,6 +3,7 @@ #define _SRC_LIB_16_DBG #include "src/lib/16_head.h" +#include "src/lib/16_pm.h" #include "src/lib/16_tdef.h" #define __DEBUG__ @@ -32,6 +33,8 @@ extern byte *dbg_mapdata; #endif #endif +void ShapeTest (global_game_variables_t *gvar); + #ifdef __WATCOMC__ # ifdef DEBUGSERIAL # include -- 2.39.2