From 7f33f5e74cc6486faa7182f3a12f214180e118fd Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 1 Jun 2017 18:49:32 -0500 Subject: [PATCH] 16_ca needs huge amounts of work and I should remember what needs to be done soon[going to port rest of code to borland c some time so we can use the core components of id engine here ][going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] added 1st scroll back [i work on CA] palette debug show values added wwww and i need to know how to see vrs/vrl imaage data palette index numbers [i am trying to find out how the hell you get the index number values of VRL/VRS] boom has been fixed ^^[CA_CacheMap added seems to be used in start a new game] what is mapsegs? [there maybe too much unused code] working on 286 --- DEBUG.16W | 210 --------------------------------------------- HEAP.16W | 106 ++++++++--------------- MMDUMP.16W | Bin 2244 -> 2266 bytes XCROLL.16W | Bin 2288 -> 0 bytes XCROLL1.16W | Bin 2222 -> 0 bytes XCROLL2.16W | Bin 2244 -> 0 bytes XCROLL3.16W | Bin 2244 -> 0 bytes XCROLL4.16W | Bin 2288 -> 0 bytes src/lib/16_hc.c | 31 +++++-- src/lib/16_head.c | 4 + src/lib/16_mm.c | 7 ++ src/lib/16_tdef.h | 1 + src/lib/16_vl_2.c | 4 - src/lib/scroll16.c | 2 +- src/xcroll.c | 17 ++-- 15 files changed, 82 insertions(+), 300 deletions(-) delete mode 100755 DEBUG.16W delete mode 100755 XCROLL.16W delete mode 100755 XCROLL1.16W delete mode 100755 XCROLL2.16W delete mode 100755 XCROLL3.16W delete mode 100755 XCROLL4.16W diff --git a/DEBUG.16W b/DEBUG.16W deleted file mode 100755 index 257ae9ff..00000000 --- a/DEBUG.16W +++ /dev/null @@ -1,210 +0,0 @@ -Seg:0 Size:10306 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++00 -Seg:2896 Size:76 Owner:0x0 -0 -Seg:28e2 Size:256 Owner:0x6120 -0 -Seg:29e2 Size:256 Owner:0x1f62 -0 -Seg:2ae2 Size:256 Owner:0x1f64 -0 -Seg:2be2 Size:256 Owner:0x1f66 -0 -Seg:2ce2 Size:256 Owner:0x1f68 -0 -Seg:2de2 Size:256 Owner:0x1f6a -0 -Seg:2ee2 Size:256 Owner:0x1f6c -0 -Seg:2fe2 Size:256 Owner:0x1f6e -0 -Seg:30e2 Size:256 Owner:0x1f70 -0 -Seg:31e2 Size:256 Owner:0x1f72 -0 -Seg:32e2 Size:256 Owner:0x1f74 -0 -Seg:33e2 Size:256 Owner:0x1f76 -0 -Seg:34e2 Size:256 Owner:0x1f78 -0 -Seg:35e2 Size:256 Owner:0x1f7a -0 -Seg:36e2 Size:256 Owner:0x1f7c -0 -Seg:37e2 Size:256 Owner:0x1f7e -0 -Seg:38e2 Size:256 Owner:0x1f80 -0 -Seg:39e2 Size:256 Owner:0x1f82 -0 -Seg:3ae2 Size:256 Owner:0x1f84 -0 -Seg:3be2 Size:256 Owner:0x1f86 -0 -Seg:3ce2 Size:256 Owner:0x1f88 -0 -Seg:3de2 Size:256 Owner:0x1f8a -0 -Seg:3ee2 Size:256 Owner:0x1f8c -0 -Seg:3fe2 Size:256 Owner:0x1f8e -0 -Seg:40e2 Size:256 Owner:0x1f90 -0 -Seg:41e2 Size:256 Owner:0x1f92 -0 -Seg:42e2 Size:256 Owner:0x1f94 -0 -Seg:43e2 Size:256 Owner:0x1f96 -0 -Seg:44e2 Size:256 Owner:0x1f98 -0 -Seg:45e2 Size:256 Owner:0x1f9a -0 -Seg:46e2 Size:256 Owner:0x1f9c -0 -Seg:47e2 Size:256 Owner:0x1f9e -0 -Seg:48e2 Size:256 Owner:0x1fa0 -0 -Seg:49e2 Size:256 Owner:0x1fa2 -0 -Seg:4ae2 Size:256 Owner:0x1fa4 -0 -Seg:4be2 Size:256 Owner:0x1fa6 -0 -Seg:4ce2 Size:256 Owner:0x1fa8 -0 -Seg:4de2 Size:256 Owner:0x1faa -0 -Seg:4ee2 Size:256 Owner:0x1fac -0 -Seg:4fe2 Size:256 Owner:0x1fae -0 -Seg:50e2 Size:256 Owner:0x1fb0 -0 -Seg:51e2 Size:256 Owner:0x1fb2 -0 -Seg:52e2 Size:256 Owner:0x1fb4 -0 -Seg:53e2 Size:256 Owner:0x1fb6 -0 -Seg:54e2 Size:256 Owner:0x1fb8 -0 -Seg:55e2 Size:256 Owner:0x1fba -0 -Seg:56e2 Size:256 Owner:0x1fbc -0 -Seg:57e2 Size:256 Owner:0x1fbe -0 -Seg:58e2 Size:256 Owner:0x1fc0 -0 -Seg:59e2 Size:256 Owner:0x1fc2 -0 -Seg:5ae2 Size:256 Owner:0x1fc4 -0 -Seg:5be2 Size:256 Owner:0x1fc6 -0 -Seg:5ce2 Size:256 Owner:0x1fc8 -0 -Seg:5de2 Size:256 Owner:0x1fca -0 -Seg:5ee2 Size:256 Owner:0x1fcc -0 -Seg:5fe2 Size:256 Owner:0x1fce -0 -Seg:60e2 Size:256 Owner:0x1fd0 -0 -Seg:61e2 Size:256 Owner:0x1fd2 -0 -Seg:62e2 Size:256 Owner:0x1fd4 -0 -Seg:63e2 Size:256 Owner:0x1fd6 -0 -Seg:64e2 Size:256 Owner:0x1fd8 -0 -Seg:65e2 Size:256 Owner:0x1fda -0 -Seg:66e2 Size:256 Owner:0x1fdc -0 -Seg:67e2 Size:256 Owner:0x1fde -0 -Seg:68e2 Size:256 Owner:0x1fe0 -0 -Seg:69e2 Size:256 Owner:0x1fe2 -0 -Seg:6ae2 Size:256 Owner:0x1fe4 -0 -Seg:6be2 Size:256 Owner:0x1fe6 -0 -Seg:6ce2 Size:256 Owner:0x1fe8 -0 -Seg:6de2 Size:256 Owner:0x1fea -0 -Seg:6ee2 Size:256 Owner:0x1fec -0 -Seg:6fe2 Size:256 Owner:0x1fee -0 -Seg:70e2 Size:256 Owner:0x1ff0 -0 -Seg:71e2 Size:256 Owner:0x1ff2 -0 -Seg:72e2 Size:256 Owner:0x1ff4 -0 -Seg:73e2 Size:256 Owner:0x1ff6 -0 -Seg:74e2 Size:256 Owner:0x1ff8 -0 -Seg:75e2 Size:256 Owner:0x1ffa -0 -Seg:76e2 Size:256 Owner:0x1ffc -0 -Seg:77e2 Size:256 Owner:0x1ffe -0 -Seg:78e2 Size:256 Owner:0x2000 -0 -Seg:79e2 Size:256 Owner:0x2002 -0 -Seg:7ae2 Size:256 Owner:0x2004 -0 -Seg:7be2 Size:256 Owner:0x2006 -0 -Seg:7ce2 Size:256 Owner:0x2008 -0 -Seg:7de2 Size:256 Owner:0x200a -0 -Seg:7ee2 Size:256 Owner:0x200c -0 -Seg:7fe2 Size:256 Owner:0x200e -0 -Seg:80e2 Size:256 Owner:0x2010 -0 -Seg:81e2 Size:256 Owner:0x2012 -0 -Seg:82e2 Size:256 Owner:0x2014 -0 -Seg:83e2 Size:256 Owner:0x2016 -0 -Seg:84e2 Size:256 Owner:0x2018 -0 -Seg:85e2 Size:256 Owner:0x201a -0 -Seg:86e2 Size:256 Owner:0x201c -0 -Seg:87e2 Size:256 Owner:0x201e -0 -Seg:88e2 Size:256 Owner:0x2020 -0 -Seg:89e2 Size:256 Owner:0x2022 -0 -Seg:8ae2 Size:256 Owner:0x2024 -0 -Seg:8be2 Size:256 Owner:0x2026 -0 -Seg:8ce2 Size:256 Owner:0x2028 -0 -Seg:8de2 Size:273 Owner:0x6120 -000000000000000000000000000000000000000000000000 -Seg:9dc1 Size:25150 Owner:0x0 - \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index 8f8a02d6..22675032 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,81 +1,47 @@ - == default == - - USED block at 2ed20016 of size 4098 - USED block at 2ed21018 of size 20 - USED block at 2ed2102c of size 66 - USED block at 2ed2106e of size 50 - USED block at 2ed210a0 of size 50 - USED block at 2ed210d2 of size 50 - USED block at 2ed21104 of size 50 - USED block at 2ed21136 of size 50 - USED block at 2ed21168 of size 50 - USED block at 2ed2119a of size 50 - USED block at 2ed211cc of size 50 - USED block at 2ed211fe of size 50 - USED block at 2ed21230 of size 50 - USED block at 2ed21262 of size 50 - USED block at 2ed21294 of size 50 - FREE block at 2ed212c6 of size 29552 - USED block at 2ed28636 of size 1202 - USED block at 2ed28ae8 of size 1202 - USED block at 2ed28f9a of size 1202 - USED block at 2ed2944c of size 136 - USED block at 2ed294d4 of size 22 - FREE block at 2ed294ea of size 8202 - FREE block at 2ed2b4f4 of size 0 -ERROR - bad node in heap - == near == - FREE block at 1ed1f9f6 of size 12 - FREE block at 1ed1fa02 of size 320 - FREE block at 1ed1fb42 of size 52 - FREE block at 1ed1fb76 of size 20 - FREE block at 1ed1fb8a of size 20 - FREE block at 1ed1fb9e of size 20 - FREE block at 1ed1fbb2 of size 20 - FREE block at 1ed1fbc6 of size 20 - FREE block at 1ed1fbda of size 1058 + USED block at 1d0d:f9a6 of size 12 + USED block at 1d0d:f9b2 of size 320 + USED block at 1d0d:faf2 of size 52 + USED block at 1d0d:fb26 of size 20 + USED block at 1d0d:fb3a of size 20 + USED block at 1d0d:fb4e of size 20 + USED block at 1d0d:fb62 of size 20 + USED block at 1d0d:fb76 of size 20 + FREE block at 1d0d:fb8a of size 1138 OK - end of heap == far == - FREE block at 2ed20016 of size 4098 - FREE block at 2ed21018 of size 20 - FREE block at 2ed2102c of size 66 - FREE block at 2ed2106e of size 50 - FREE block at 2ed210a0 of size 50 - FREE block at 2ed210d2 of size 50 - FREE block at 2ed21104 of size 50 - FREE block at 2ed21136 of size 50 - FREE block at 2ed21168 of size 50 - FREE block at 2ed2119a of size 50 - FREE block at 2ed211cc of size 50 - FREE block at 2ed211fe of size 50 - FREE block at 2ed21230 of size 50 - FREE block at 2ed21262 of size 50 - FREE block at 2ed21294 of size 50 - FREE block at 2ed212c6 of size 29552 - FREE block at 2ed28636 of size 1202 - FREE block at 2ed28ae8 of size 1202 - FREE block at 2ed28f9a of size 1202 - FREE block at 2ed2944c of size 136 - FREE block at 2ed294d4 of size 22 - FREE block at 2ed294ea of size 8202 - FREE block at 2ed2b4f4 of size 0 -ERROR - bad node in heap + USED block at 2d0e:0016 of size 10246 + USED block at 2d0e:281c of size 136 + USED block at 2d0e:28a4 of size 66 + USED block at 2d0e:28e6 of size 50 + USED block at 2d0e:2918 of size 50 + USED block at 2d0e:294a of size 50 + USED block at 2d0e:297c of size 50 + USED block at 2d0e:29ae of size 50 + USED block at 2d0e:29e0 of size 50 + USED block at 2d0e:2a12 of size 50 + USED block at 2d0e:2a44 of size 50 + USED block at 2d0e:2a76 of size 50 + USED block at 2d0e:2aa8 of size 50 + USED block at 2d0e:2ada of size 50 + USED block at 2d0e:2b0c of size 50 + USED block at 2d0e:2b3e of size 20 + FREE block at 2d0e:2b52 of size 7370 +OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- -Default 46302 8548 37754 -Near 1542 484 1058 -Far 46302 8548 37754 +Near 1622 484 1138 +Far 18438 11068 7370 ---------------- -------- -------- -------- -HC_coreleft = 1056 -HC_farcoreleft = 415744 -HC_GetFreeSize = 37754 -HC_GetNearFreeSize = 1058 -HC_GetFarFreeSize = 37754 -memavl = 1056 -stackavail = 31484 +HC_coreleft = 1136 +HC_farcoreleft = 450560 +HC_GetFreeSize = 7370 +HC_GetNearFreeSize = 1138 +HC_GetFarFreeSize = 7370 +memavl = 1136 +stackavail = 31498 diff --git a/MMDUMP.16W b/MMDUMP.16W index 276718ef91cb1f13c1aedf751a472b98ad369144..1c61f4331acaabb8a4f75f9178df8fce26ecc8ed 100755 GIT binary patch delta 188 zcmX>icuSDqpu)hwD8c;15hg=32xS4G5fZAK7nMi6aAU~NVaZN^}2mc~X38UYNN3bqOcyj)PHm>C+I Q0iA*&ngmp3QDo!`vR0Awcv G)J_0Gl^(tT diff --git a/XCROLL.16W b/XCROLL.16W deleted file mode 100755 index 32f5ab2d6e7eb68e1b8f824a0ec43b301ef8d7c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2288 zcmZwJJ5B>J6hKiVIwbZmWhf$fqQv$fu?M!`@n->4Y=a%+ky0h6y@lU#;ZOJt;nF_W zRLXKX|9mW8OL%_^_uBXCtgjDsT}@>CNDox6pgs8qepg&|B!;>D}o)ZlmXEJH0!-JH0!-JH3_ON^hmN(p%}R z^j3N+y^Y>RZ=<)-+vsidHhLSqo!(Awr?=DF>FxA(dON*?-a+r6chEcN9rO-*2fUXM r;GGrTS>c@(-dW+D72a9lot55|-WA@s9@EYb|B|>K@5TA={#*G6x8&3> diff --git a/XCROLL1.16W b/XCROLL1.16W deleted file mode 100755 index 10ab33c3c0c6a1c17a23d0c3507419fc8188b3d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2222 zcmZwJxlIH?07OyjmB?XCFpzpiyL}*$11anXu?kj*YR;lwH~MQ z_xtgAgtyo5SJ$l{r>~c%I#ut1^~!oBfXo9WH;7J3W4h2BDMp|{Xm=q>bCdMmw^-b!z! z_i-Pd_pQ=f>235jdK0R_LdKbNm-bL@CchS4xy@mkquJG;(@2>Ff3h%D)?h5a& R^j_$_z#A`*Y3KjHnXu?kj*YR;lwH~MQ z_xtgAgtyo5SJ$l{r>~c%I#ut1^~!oBfXo9WH;7J3W4h2BDMp|{Xm=q>bCdMmw^-b!z! z_i-Pd_pQ=f>235jdK0R_LdKbNm-bL@CchS4xy@mkquJG;(@2>Ff3h%D)?h5a& R^j_$_z#A`*Y3KjHJ6hKiVIwbZmWhf$fqQv$fu?M!`@n->4Y=a%+ky0h6y@lU#;ZOJt;nF_W zRLXKX|9mW8OL%_^_uBXCtgjDsT}@>CNDox6pgs8qepg&|B!;>D}o)ZlmXEJH0!-JH0!-JH3_ON^hmN(p%}R z^j3N+y^Y>RZ=<)-+vsidHhLSqo!(Awr?=DF>FxA(dON*?-a+r6chEcN9rO-*2fUXM r;GGrTS>c@(-dW+D72a9lot55|-WA@s9@EYb|B|>K@5TA={#*G6x8&3> diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c index f2963158..e80d7714 100755 --- a/src/lib/16_hc.c +++ b/src/lib/16_hc.c @@ -421,13 +421,14 @@ size_t HC_GetNearFreeSize(void) void HC_heapdump(global_game_variables_t *gvar) { - struct _heapinfo fh_info, nh_info, h_info; + struct _heapinfo fh_info, nh_info;//, h_info; int heap_status; - size_t h_free, nh_free, fh_free, h_total, nh_total, fh_total, h_used, nh_used, fh_used; + size_t nh_free, fh_free, nh_total, fh_total, nh_used, fh_used;//, h_free, h_total, h_used; byte scratch[1024],str[16]; HC_OpenDebug(gvar); +#if 0 strcpy(scratch,"\n == default ==\n\n"); write(gvar->handle.heaphandle,scratch,strlen(scratch)); h_info._pentry = NULL; @@ -435,13 +436,16 @@ void HC_heapdump(global_game_variables_t *gvar) for(;;) { heap_status = _heapwalk( &h_info ); if( heap_status != _HEAPOK ) break; - strcpy(scratch," "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); ultoa((dword)h_info._pentry,str,16); strcat(scratch,str); strcat(scratch," of size "); ultoa(h_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n"); + strcpy(scratch," "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); + sprintf(str, "%Fp", h_info._pentry); //ultoa((dword)h_info._pentry,str,16); + strcat(scratch,str); strcat(scratch," of size "); ultoa(h_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n"); if((h_info._useflag == _USEDENTRY ? "USED" : "FREE")=="FREE") h_free += h_info._size; if((h_info._useflag == _USEDENTRY ? "USED" : "FREE")=="USED") h_used += h_info._size; h_total += h_info._size; write(gvar->handle.heaphandle,scratch,strlen(scratch)); } HC_heapstat(gvar, heap_status, &scratch); +#endif //near strcpy(scratch,"\n == near ==\n\n"); @@ -451,7 +455,9 @@ void HC_heapdump(global_game_variables_t *gvar) for(;;) { heap_status = _nheapwalk( &nh_info ); if( heap_status != _HEAPOK ) break; - strcpy(scratch," "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); ultoa((dword)nh_info._pentry,str,16); strcat(scratch,str); strcat(scratch," of size "); ultoa(nh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n"); + strcpy(scratch," "); strcat(scratch,(nh_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); + sprintf(str, "%Fp", nh_info._pentry); //ultoa((dword)nh_info._pentry,str,16); + strcat(scratch,str); strcat(scratch," of size "); ultoa(nh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n"); /* printf( " %s block at %Fp of size %4.4X\n", (nh_info._useflag == _USEDENTRY ? "USED" : "FREE"), nh_info._pentry, nh_info._size );*/ @@ -470,7 +476,9 @@ nh_info._pentry, nh_info._size );*/ for(;;) { heap_status = _fheapwalk( &fh_info ); if( heap_status != _HEAPOK ) break; - strcpy(scratch," "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); ultoa((dword)fh_info._pentry,str,16); strcat(scratch,str); strcat(scratch," of size "); ultoa(fh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n"); + strcpy(scratch," "); strcat(scratch,(fh_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); + sprintf(str, "%Fp", fh_info._pentry); //ultoa((dword)fh_info._pentry,str,16); + strcat(scratch,str); strcat(scratch," of size "); ultoa(fh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n"); /*printf( " %s block at %Fp of size %4.4X\n", (fh_info._useflag == _USEDENTRY ? "USED" : "FREE"), fh_info._pentry, fh_info._size );*/ @@ -484,7 +492,7 @@ fh_info._pentry, fh_info._size );*/ strcpy(scratch,"\n"); strcat(scratch,kittengets(2,0,"Memory Type Total Used Free\n")); strcat(scratch,"---------------- -------- -------- --------\n"); - printmeminfoline(&scratch, "Default", h_total, h_used, h_free); +// printmeminfoline(&scratch, "Default", h_total, h_used, h_free); printmeminfoline(&scratch, "Near", nh_total, nh_used, nh_free); printmeminfoline(&scratch, "Far", fh_total, fh_used, fh_free); strcat(scratch,"---------------- -------- -------- --------\n"); @@ -554,15 +562,22 @@ void HC_OpenDebug(global_game_variables_t *gvar) { #ifdef __BORLANDC__ unlink("heap.16b"); - gvar->handle.heaphandle = open("heap.16b", O_CREAT | O_WRONLY | O_TEXT); + gvar->handle.heaphandle = open(gvar->handle.heapdumpfilename, O_CREAT | O_WRONLY | O_TEXT); #endif #ifdef __WATCOMC__ unlink("heap.16w"); - gvar->handle.heaphandle = open("heap.16w", O_CREAT | O_WRONLY | O_TEXT); + gvar->handle.heaphandle = open(gvar->handle.heapdumpfilename, O_CREAT | O_WRONLY | O_TEXT); #endif } void HC_CloseDebug(global_game_variables_t *gvar) { close(gvar->handle.heaphandle); + +#ifdef __BORLANDC__ + strcpy(gvar->handle.heapdumpfilename, "heap.16b"); +#endif +#ifdef __WATCOMC__ + strcpy(gvar->handle.heapdumpfilename, "heap.16w"); +#endif } diff --git a/src/lib/16_head.c b/src/lib/16_head.c index 8786a9fd..1af19534 100755 --- a/src/lib/16_head.c +++ b/src/lib/16_head.c @@ -22,6 +22,10 @@ #include "src/lib/16_head.h" +// big global status text buffer +char global_temp_status_text[512]; +char global_temp_status_text2[512]; + long int filesize(FILE *fp) { diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index e2e38ca1..c5c51486 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -823,6 +823,13 @@ void MM_Reset (global_game_variables_t *gvar) #ifdef __WATCOMC__ strcpy(gvar->handle.datadumpfilename, "mmdump.16w"); #endif + +#ifdef __BORLANDC__ + strcpy(gvar->handle.heapdumpfilename, "heap.16b"); +#endif +#ifdef __WATCOMC__ + strcpy(gvar->handle.heapdumpfilename, "heap.16w"); +#endif } diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index 8eeaefd7..2d3e6067 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -335,6 +335,7 @@ typedef struct int profilehandle,debughandle,showmemhandle; int heaphandle; byte datadumpfilename[12]; + byte heapdumpfilename[12]; } loghandle_t; typedef struct diff --git a/src/lib/16_vl_2.c b/src/lib/16_vl_2.c index 2b79a76f..40306855 100755 --- a/src/lib/16_vl_2.c +++ b/src/lib/16_vl_2.c @@ -25,10 +25,6 @@ #include #include "src/lib/16_vl.h" -// big global status text buffer -char global_temp_status_text[512]; -char global_temp_status_text2[512]; - #define PRINTTEXTBOXSTABLE void VL_modexPrintTextBox(global_game_variables_t *gvar) diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index a3f28541..42b2621f 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -662,7 +662,7 @@ sword chkmap(map_t *map, word q) //1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1 }; //1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4 }; //check for failed to load map - if((map->width == map->height == 0) && (q>0)) + if((!map->width || !map->height) && (q>0)) { //initiate a null map! map->width=MAPW; diff --git a/src/xcroll.c b/src/xcroll.c index 816c600e..efa76b75 100755 --- a/src/xcroll.c +++ b/src/xcroll.c @@ -28,7 +28,7 @@ //#define NOMAPLOAD //#define OLDPLAYERSPRITESTUFF #ifdef __DEBUG__ -//#define SCROLLEXEDEBUG +#define SCROLLEXEDEBUG boolean dbg_nointest=1; #endif @@ -95,11 +95,12 @@ void main(int argc, char *argv[]) // create the map #ifdef SCROLLEXEDEBUG - strcpy(gvar.handle.datadumpfilename, "xcroll1.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.datadumpfilename, "mmdump1.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.heapdumpfilename, "heap1.16w"); HC_heapdump(&gvar); //fprintf(stderr, "testing map load~ "); #endif - CA_loadmap("data/test.map", &gvar.map, &gvar); #ifndef NOMAPLOAD + CA_loadmap("data/test.map", &gvar.map, &gvar); chkmap(&gvar.map, 0); #else chkmap(&gvar.map, 1); @@ -108,7 +109,8 @@ void main(int argc, char *argv[]) #ifdef SCROLLEXEDEBUG printf("chkmap ok\n"); // fprintf(stderr, "yay map loaded~~\n"); - strcpy(gvar.handle.datadumpfilename, "xcroll2.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.datadumpfilename, "mmdump2.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.heapdumpfilename, "heap2.16w"); HC_heapdump(&gvar); #endif // data @@ -118,14 +120,15 @@ void main(int argc, char *argv[]) #else #ifdef SCROLLEXEDEBUG fprintf(stderr, "VRS_LoadVRS~ "); - strcpy(gvar.handle.datadumpfilename, "xcroll3.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.datadumpfilename, "mmdump3.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.heapdumpfilename, "heap3.16w"); HC_heapdump(&gvar); #endif VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar); #ifdef SCROLLEXEDEBUG printf("VRS load OK~\n"); - strcpy(gvar.handle.datadumpfilename, "xcroll4.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.datadumpfilename, "mmdump4.16w"); MM_DumpData (&gvar); + //strcpy(gvar.handle.heapdumpfilename, "heap4.16w"); HC_heapdump(&gvar); #endif - strcpy(gvar.handle.datadumpfilename, "xcroll.16w"); #endif // input! -- 2.39.2