From: sparky4 Date: Tue, 6 Jun 2017 02:01:36 +0000 (-0500) Subject: pee X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=8fe59539760b4d569c902912818c12bb5ffa9dde;p=16.git pee --- diff --git a/DEBUG.16B b/DEBUG.16B new file mode 100755 index 00000000..ccae1ef3 --- /dev/null +++ b/DEBUG.16B @@ -0,0 +1,209 @@ +Seg:0 Size:5739 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++Seg:166b Size:256 Owner:0x764d +0 +Seg:176b Size:256 Owner:0x341a +0 +Seg:186b Size:256 Owner:0x341c +0 +Seg:196b Size:256 Owner:0x341e +0 +Seg:1a6b Size:256 Owner:0x3420 +0 +Seg:1b6b Size:256 Owner:0x3422 +0 +Seg:1c6b Size:256 Owner:0x3424 +0 +Seg:1d6b Size:256 Owner:0x3426 +0 +Seg:1e6b Size:256 Owner:0x3428 +0 +Seg:1f6b Size:256 Owner:0x342a +0 +Seg:206b Size:256 Owner:0x342c +0 +Seg:216b Size:256 Owner:0x342e +0 +Seg:226b Size:256 Owner:0x3430 +0 +Seg:236b Size:256 Owner:0x3432 +0 +Seg:246b Size:256 Owner:0x3434 +0 +Seg:256b Size:256 Owner:0x3436 +0 +Seg:266b Size:256 Owner:0x3438 +0 +Seg:276b Size:256 Owner:0x343a +0 +Seg:286b Size:256 Owner:0x343c +0 +Seg:296b Size:256 Owner:0x343e +0 +Seg:2a6b Size:256 Owner:0x3440 +0 +Seg:2b6b Size:256 Owner:0x3442 +0 +Seg:2c6b Size:256 Owner:0x3444 +0 +Seg:2d6b Size:256 Owner:0x3446 +0 +Seg:2e6b Size:256 Owner:0x3448 +0 +Seg:2f6b Size:256 Owner:0x344a +0 +Seg:306b Size:256 Owner:0x344c +0 +Seg:316b Size:256 Owner:0x344e +0 +Seg:326b Size:256 Owner:0x3450 +0 +Seg:336b Size:256 Owner:0x3452 +0 +Seg:346b Size:256 Owner:0x3454 +0 +Seg:356b Size:256 Owner:0x3456 +0 +Seg:366b Size:256 Owner:0x3458 +0 +Seg:376b Size:256 Owner:0x345a +0 +Seg:386b Size:256 Owner:0x345c +0 +Seg:396b Size:256 Owner:0x345e +0 +Seg:3a6b Size:256 Owner:0x3460 +0 +Seg:3b6b Size:256 Owner:0x3462 +0 +Seg:3c6b Size:256 Owner:0x3464 +0 +Seg:3d6b Size:256 Owner:0x3466 +0 +Seg:3e6b Size:256 Owner:0x3468 +0 +Seg:3f6b Size:256 Owner:0x346a +0 +Seg:406b Size:256 Owner:0x346c +0 +Seg:416b Size:256 Owner:0x346e +0 +Seg:426b Size:256 Owner:0x3470 +0 +Seg:436b Size:256 Owner:0x3472 +0 +Seg:446b Size:256 Owner:0x3474 +0 +Seg:456b Size:256 Owner:0x3476 +0 +Seg:466b Size:256 Owner:0x3478 +0 +Seg:476b Size:256 Owner:0x347a +0 +Seg:486b Size:256 Owner:0x347c +0 +Seg:496b Size:256 Owner:0x347e +0 +Seg:4a6b Size:256 Owner:0x3480 +0 +Seg:4b6b Size:256 Owner:0x3482 +0 +Seg:4c6b Size:256 Owner:0x3484 +0 +Seg:4d6b Size:256 Owner:0x3486 +0 +Seg:4e6b Size:256 Owner:0x3488 +0 +Seg:4f6b Size:256 Owner:0x348a +0 +Seg:506b Size:256 Owner:0x348c +0 +Seg:516b Size:256 Owner:0x348e +0 +Seg:526b Size:256 Owner:0x3490 +0 +Seg:536b Size:256 Owner:0x3492 +0 +Seg:546b Size:256 Owner:0x3494 +0 +Seg:556b Size:256 Owner:0x3496 +0 +Seg:566b Size:256 Owner:0x3498 +0 +Seg:576b Size:256 Owner:0x349a +0 +Seg:586b Size:256 Owner:0x349c +0 +Seg:596b Size:256 Owner:0x349e +0 +Seg:5a6b Size:256 Owner:0x34a0 +0 +Seg:5b6b Size:256 Owner:0x34a2 +0 +Seg:5c6b Size:256 Owner:0x34a4 +0 +Seg:5d6b Size:256 Owner:0x34a6 +0 +Seg:5e6b Size:256 Owner:0x34a8 +0 +Seg:5f6b Size:256 Owner:0x34aa +0 +Seg:606b Size:256 Owner:0x34ac +0 +Seg:616b Size:256 Owner:0x34ae +0 +Seg:626b Size:256 Owner:0x34b0 +0 +Seg:636b Size:256 Owner:0x34b2 +0 +Seg:646b Size:256 Owner:0x34b4 +0 +Seg:656b Size:256 Owner:0x34b6 +0 +Seg:666b Size:256 Owner:0x34b8 +0 +Seg:676b Size:256 Owner:0x34ba +0 +Seg:686b Size:256 Owner:0x34bc +0 +Seg:696b Size:256 Owner:0x34be +0 +Seg:6a6b Size:256 Owner:0x34c0 +0 +Seg:6b6b Size:256 Owner:0x34c2 +0 +Seg:6c6b Size:256 Owner:0x34c4 +0 +Seg:6d6b Size:256 Owner:0x34c6 +0 +Seg:6e6b Size:256 Owner:0x34c8 +0 +Seg:6f6b Size:256 Owner:0x34ca +0 +Seg:706b Size:256 Owner:0x34cc +0 +Seg:716b Size:256 Owner:0x34ce +0 +Seg:726b Size:256 Owner:0x34d0 +0 +Seg:736b Size:256 Owner:0x34d2 +0 +Seg:746b Size:256 Owner:0x34d4 +0 +Seg:756b Size:256 Owner:0x34d6 +0 +Seg:766b Size:256 Owner:0x34d8 +0 +Seg:776b Size:256 Owner:0x34da +0 +Seg:786b Size:256 Owner:0x34dc +0 +Seg:796b Size:256 Owner:0x34de +0 +Seg:7a6b Size:256 Owner:0x34e0 +0 +Seg:7b6b Size:273 Owner:0x764d +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:9fbe Size:32834 Owner:0x0 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:9f3f Size:24768 Owner:0x0 + \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W deleted file mode 100755 index e9f84890..00000000 --- a/HEAP.16W +++ /dev/null @@ -1,53 +0,0 @@ - - == near == - - USED block at 1e7f:fa16 of size 12 - USED block at 1e7f:fa22 of size 320 - USED block at 1e7f:fb62 of size 52 - USED block at 1e7f:fb96 of size 20 - USED block at 1e7f:fbaa of size 20 - USED block at 1e7f:fbbe of size 20 - USED block at 1e7f:fbd2 of size 20 - USED block at 1e7f:fbe6 of size 20 - FREE block at 1e7f:fbfa of size 1026 -OK - end of heap - - == far == - - USED block at 2e80:0016 of size 4098 - USED block at 2e80:1018 of size 20 - USED block at 2e80:102c of size 66 - USED block at 2e80:106e of size 50 - USED block at 2e80:10a0 of size 50 - USED block at 2e80:10d2 of size 50 - USED block at 2e80:1104 of size 50 - USED block at 2e80:1136 of size 50 - USED block at 2e80:1168 of size 50 - USED block at 2e80:119a of size 50 - USED block at 2e80:11cc of size 50 - USED block at 2e80:11fe of size 50 - USED block at 2e80:1230 of size 50 - USED block at 2e80:1262 of size 50 - USED block at 2e80:1294 of size 50 - FREE block at 2e80:12c6 of size 29552 - USED block at 2e80:8636 of size 1202 - USED block at 2e80:8ae8 of size 1202 - USED block at 2e80:8f9a of size 1202 - USED block at 2e80:944c of size 136 - USED block at 2e80:94d4 of size 22 - FREE block at 2e80:94ea of size 8202 - FREE block at 2e80:b4f4 of size 0 -ERROR - bad node in heap - -Memory Type Total Used Free ----------------- -------- -------- -------- -Near 1510 484 1026 -Far 46302 8548 37754 ----------------- -------- -------- -------- -HC_coreleft = 1024 -HC_farcoreleft = 417792 -HC_GetFreeSize = 37754 -HC_GetNearFreeSize = 1026 -HC_GetFarFreeSize = 37754 -memavl = 1024 -stackavail = 31498 diff --git a/MMDUMP.16B b/MMDUMP.16B new file mode 100755 index 00000000..eeec0ce7 Binary files /dev/null and b/MMDUMP.16B differ diff --git a/MMDUMP.16W b/MMDUMP.16W deleted file mode 100755 index 117c7dc4..00000000 Binary files a/MMDUMP.16W and /dev/null differ diff --git a/bcexmm.dsk b/bcexmm.dsk index 6ae999a4..b0e92853 100755 Binary files a/bcexmm.dsk and b/bcexmm.dsk differ diff --git a/bcexmm.exe b/bcexmm.exe index 80889851..ad0e6412 100755 Binary files a/bcexmm.exe and b/bcexmm.exe differ diff --git a/bcexmm.prj b/bcexmm.prj index 3da423e7..c56c954c 100755 Binary files a/bcexmm.prj and b/bcexmm.prj differ diff --git a/makefile b/makefile index 8c815b01..f9712f42 100755 --- a/makefile +++ b/makefile @@ -532,6 +532,7 @@ comq: .symbolic www: .symbolic @if exist 16.exe @wmake -s -h wwwdo + @if exist 16.exe @wmake -s -h wwwext wwwdo: .symbolic @for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f @@ -540,7 +541,6 @@ wwwdo: .symbolic @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/ @./src/util/z.sh $(EXEC) $(EXEC) @./src/util/z2.sh data.zip data - @wmake -s -h wwwext wwwext: .symbolic @wmake -s -h wwwext2 diff --git a/src/exmmtest.c b/src/exmmtest.c index ea73aa99..3ab4e02e 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -50,6 +50,7 @@ #endif #ifdef __WATCOMC__ #define NOVID +//#define SCROLLLOAD #endif @@ -69,7 +70,6 @@ #endif //////////////////////////////////////////////////////////////////////////// -//#ifdef NOVID #ifdef __BORLANDC__ void VL_Startup (global_game_variables_t *gvar){ gvar=gvar; } void VL_Shutdown (global_game_variables_t *gvar){ gvar=gvar; } @@ -130,6 +130,14 @@ void segatesuto() } #endif +#ifdef SCROLLLOAD +#define FILENAME_1 "data/spri/chikyuu.vrs" +#define FILENAME_2 "data/test.map" +#else +#define FILENAME_1 "data/koishi~.pcx" +#define FILENAME_2 "data/test.map" +#endif + //===========================================================================// //=======================================// @@ -140,18 +148,13 @@ void segatesuto() void main(int argc, char *argv[]) { - byte w; static global_game_variables_t gvar; #ifdef INITBBUF INITBBUF #endif -#if 0 -//#ifdef __WATCOMC__ - __segment sega; -#endif - char bakapee1[64] = "data/koishi~.pcx"; - char bakapee2[64] = "data/test.map"; - word baka; + + char bakapee1[64] = FILENAME_1; + char bakapee2[64] = FILENAME_2; #ifdef __BORLANDC__ argc=argc; @@ -174,13 +177,7 @@ main(int argc, char *argv[]) if(argv[1]){ strcpy(bakapee1, argv[1]);//bakapee1[] = *argv[1]; if(argv[2]) strcpy(bakapee2, argv[2]); }//bakapee2[] = argv[2]; } -#if 0 - else{ - //{ printf("filename!: "); scanf("%[^\n]", &bakapee); } - strcpy(bakapee1, "data/koishi~.pcx"); //bakapee1 = "data/koishi~.pcx"; - strcpy(bakapee2, "data/test.map"); //bakapee2 = "data/test.map"; - } -#endif + printf("bakapee1[%s]\n", bakapee1); printf("bakapee2[%s]\n", bakapee2); KEYP @@ -188,28 +185,17 @@ main(int argc, char *argv[]) #ifndef NOVID Startup16(&gvar); // save the palette - modexPalSave(&gvar.video.dpal); modexFadeOff(4, &gvar.video.dpal); //modexPalBlack(); + modexPalSave(&gvar.video.dpal); //modexFadeOff(4, &gvar.video.dpal); //modexPalBlack(); #else //NOVID StartupCAMMPM(&gvar); -/* MM_Startup(&gvar); - #ifdef __16_PM__ - #ifdef __DEBUG_PM__ - if(dbg_debugpm>0) - { - #endif //__DEBUG_PM__ - PM_Startup(&gvar); PM_CheckMainMem(&gvar); PM_UnlockMainMem(&gvar); - //0000printf("PM Started\n"); KEYP - #ifdef __DEBUG_PM__ - } - #endif //__DEBUG_PM__ - #endif //__16_PM__ - CA_Startup(&gvar);*/ #endif //elsed NOVID #ifdef PRINTBBDUMP //0000 PRINTBB; KEYP #endif + { + byte w; word baka; w=0; #ifdef FILEREADLOAD #ifdef FILEREAD @@ -229,18 +215,13 @@ PRINTBB; KEYP if(CA_LoadFile(bakapee1, BBUFPTR, &gvar)) baka=1; else baka=0; printf("====================================load end===================================\n"); } - //#ifdef __WATCOMC__ - // printf("\nsize of big buffer~=%u\n", _bmsize(sega, BBUF)); - //#endif #ifdef BUFFDUMP printf("contents of the buffer\n[\n%s\n]\n", BBUFSTRING); - #endif// #else + #endif #ifdef PRINTBBDUMP PRINTBB; #endif - //endif // BUFFDUMP - //printf("dark purple = purgable\n"); //printf("medium blue = non purgable\n"); //printf("red = locked\n"); @@ -255,12 +236,24 @@ PRINTBB; KEYP } #endif #endif //filereadload + } + + #ifdef SCROLLLOAD +// #else //scrollload + CA_loadmap(bakapee2, &gvar.map, &gvar); +// newloadmap(bakapee2, &gvar.map); + VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar); + HC_heapdump(&gvar); + KEYP + #endif //scrollload -#ifdef __WATCOMC__ #ifndef NOVID - VGAmodeX(8, 0, &gvar); -// modexPalUpdate0(&gvar.video.palette); + VL_Startup(&gvar);// VGAmodeX(8, 0, &gvar); + modexHiganbanaPageSetup(&gvar); +// VL_modexPalScramble(&gvar.video.palette); + VL_LoadPalFileCore(&gvar.video.palette, &gvar); // ShapeTest_(&gvar); +#endif MM_ShowMemory(&gvar); #if 0 { @@ -297,10 +290,11 @@ PRINTBB; KEYP } } #endif - VGAmodeX(0, 0, &gvar); -#endif +#ifndef NOVID + if(gvar.video.VL_Started) + VL_Shutdown (&gvar);//VGAmodeX(0, 0, gvar); + modexFadeOn(4, gvar.video.dpal); #endif - MM_ShowMemory(&gvar); DebugMemory_(&gvar, 1); MM_DumpData(&gvar); MM_Report_(&gvar); @@ -311,14 +305,6 @@ PRINTBB; KEYP Shutdown16(&gvar); #else //novid ShutdownCAMMPM(&gvar); -/* #ifdef __16_PM__ - #ifdef __DEBUG_PM__ - if(dbg_debugpm>0) - #endif //__DEBUG_PM__ - PM_Shutdown(&gvar); - #endif //__16_PM__ - CA_Shutdown(&gvar); - MM_Shutdown(&gvar);*/ #endif //NOVID IN_Shutdown(&gvar); printf("========================================\n"); diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c index e80d7714..26fe6248 100755 --- a/src/lib/16_hc.c +++ b/src/lib/16_hc.c @@ -31,12 +31,9 @@ #define FARCORELEFTPTR __huge long HC_farcoreleft() { - void FARCORELEFTPTR *hp; - static long rc=736L; - long s_rc; + void FARCORELEFTPTR *hp; static long rc=736L; long s_rc; - s_rc=rc; - rc+=2L; + s_rc=rc; rc+=2L; do hp=halloc(rc-=2L, 1024); while(hp==NULL&&rc>0L); @@ -581,3 +578,17 @@ void HC_CloseDebug(global_game_variables_t *gvar) strcpy(gvar->handle.heapdumpfilename, "heap.16w"); #endif } + +#ifdef __WATCOMC__ +unsigned long farcoreleft() +{ + _fheapgrow(); + return HC_farcoreleft(); +} + +unsigned long coreleft() +{ + _nheapgrow(); + return _memavl(); +} +#endif diff --git a/src/lib/16_hc.h b/src/lib/16_hc.h index 5924d2a5..2974a3ac 100755 --- a/src/lib/16_hc.h +++ b/src/lib/16_hc.h @@ -52,4 +52,9 @@ void HC_heapstat0(int heap_status); void HC_OpenDebug(global_game_variables_t *gvar); void HC_CloseDebug(global_game_variables_t *gvar); +#ifdef __WATCOMC__ +unsigned long farcoreleft(); +unsigned long coreleft(); +#endif + #endif /* __16HC__ */ diff --git a/src/lib/16_head.h b/src/lib/16_head.h index 45fcd2da..1c95d512 100755 --- a/src/lib/16_head.h +++ b/src/lib/16_head.h @@ -160,14 +160,9 @@ extern int profilehandle,debughandle; //make it into game global //#define OLD16_VL #define nil ((void *)0) -#ifdef __BORLANDC__ -//#define _FCORELEFT 0x90000UL-16UL -#define _FCORELEFT HC_farcoreleft() -#define sprite -#endif + #ifdef __WATCOMC__ //#define _FCORELEFT 0x90000UL+16UL -#define _FCORELEFT HC_farcoreleft() /*static union REGS CPURegs; #define _AX CPURegs.x.ax @@ -187,10 +182,7 @@ extern int profilehandle,debughandle; //make it into game global #define _DL CPURegs.h.dl #define geninterrupt(n) int86(n,&CPURegs,&CPURegs);*/ -#define peekb(segm,ofs) (*(byte far*)MK_FP((segm),(ofs))) -#define peekw(segm,ofs) (*(word far*)MK_FP((segm),(ofs))) -#define pokeb(segm,ofs,value) (peekb((segm),(ofs)) = (byte)(value)) -#define pokew(segm,ofs,value) (peekw((segm),(ofs)) = (word)(value)) + typedef union REGPACK regs_t; #endif diff --git a/src/lib/16_map.c b/src/lib/16_map.c index 2d266df1..4582bc68 100755 --- a/src/lib/16_map.c +++ b/src/lib/16_map.c @@ -35,6 +35,8 @@ int jsoneq(const char *json, jsmntok_t *tok, const char *s) { return -1; } +//TODO: WORK ON THIS LIKE CRAZY! --sparky4 +//FIXME: please FIX THIS AND USE CA! --sparky4 void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) { int i, j, k, indent=0, inner_end; char *s; diff --git a/src/lib/16_map.h b/src/lib/16_map.h index 8e56d67d..d9333208 100755 --- a/src/lib/16_map.h +++ b/src/lib/16_map.h @@ -44,7 +44,7 @@ int jsoneq(const char *json, jsmntok_t *tok, const char *s); //word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q); //int loadmap(char *mn, map_t *map, global_game_variables_t *gvar); -//int newloadmap(char *mn, map_t *map); +int newloadmap(char *mn, map_t *map); int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar); #endif/*_16_LIB__H_*/ diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index c5c51486..c044ae47 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -849,7 +849,7 @@ void MM_Reset (global_game_variables_t *gvar) void MM_Startup (global_game_variables_t *gvar) { int i; - dword length; + unsigned long length; void far *start; unsigned segstart,seglength;//,endfree; @@ -857,7 +857,6 @@ void MM_Startup (global_game_variables_t *gvar) MM_Shutdown (gvar); MM_Reset (gvar); - gvar->mm.mmstarted = true; gvar->mm.bombonerror = true; // @@ -884,17 +883,8 @@ void MM_Startup (global_game_variables_t *gvar) // // get all available near conventional memory segments // -#ifdef __WATCOMC__ - _nheapgrow(); -#endif - length=(word)_memavl();//(word)coreleft(); - //start = gvar->mm.nearheap = _fmalloc(length); -#ifdef __WATCOMC__ - start = (void __far *)(gvar->mm.nearheap = _nmalloc(length)); -#endif -#ifdef __BORLANDC__ - start = (void far *)(gvar->mm.nearheap = malloc(length)); -#endif + length=coreleft(); + start = (void far *)(gvar->mm.nearheap = nearmalloc(length)); length -= 16-(FP_OFF(start)&15); length -= SAVENEARHEAP; @@ -903,30 +893,19 @@ void MM_Startup (global_game_variables_t *gvar) MML_UseSpace (segstart,seglength, gvar); gvar->mmi.nearheap = length; //0000printf("near: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); - // // get all available far conventional memory segments // -#ifdef __WATCOMC__ - _fheapgrow(); -#endif -#ifdef __BORLANDC__ -// printf("farcoreleft() %lu\n", farcoreleft()); -// printf("(farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT)); -#endif - length=_FCORELEFT; - start = gvar->mm.farheap = _fmalloc(length);//start = gvar->mm.farheap = halloc(length, 1); - + length=HC_farcoreleft(); + start = gvar->mm.farheap = farmalloc(length); length -= 16-(FP_OFF(start)&15); length -= SAVEFARHEAP; seglength = length / 16; // now in paragraphs segstart = FP_SEG(start)+(FP_OFF(start)+15)/16; MML_UseSpace (segstart,seglength, gvar); gvar->mmi.farheap = length; - //0000printf("far: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); - gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap; - + //0000printf("far: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); #if !defined(__16_PM__)// && defined(__WATCOMC__) #if 0 if(!dbg_debugpm) { diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index d26b647a..55451178 100755 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -42,7 +42,7 @@ #define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;} #define SAVENEARHEAP 0x400 // space to leave in data segment -#define SAVEFARHEAP 0 // space to leave in far heap +#define SAVEFARHEAP 0 // space to leave in far heap #define BUFFERSIZE 0x1000 // miscelanious, allways available buffer diff --git a/src/lib/16_t.h b/src/lib/16_t.h index db1871f7..2b573262 100755 --- a/src/lib/16_t.h +++ b/src/lib/16_t.h @@ -56,9 +56,6 @@ MK_FP(segment value, 0)*/ //typedef unsigned short _seg; // it will contains segment value (as Borland _seg) #define _seg __based( void ) #endif - #ifdef __BORLANDC__ -#define _memavl() coreleft() - #endif typedef void _seg * memptr; @@ -72,6 +69,9 @@ typedef void _seg * memptr; //#define SDFPTRANDPERCONV & //#define OBTPTRANDPERCONV & //#define SDTPTRANDPERCONV & + +#define nearmalloc malloc +#define nearfree free #endif // @@ -103,13 +103,19 @@ typedef void _seg * memptr; #define getvect _dos_getvect #define setvect _dos_setvect +#define farmalloc _fmalloc +#define farfree _ffree +#define nearmalloc _nmalloc +#define nearfree _nfree + //from http://www.verycomputer.com/3_65d875cc818b54ec_1.htm void clrscr(void); -#pragma aux clrscr= \ - " mov ah, 0fh " \ - " int 10h " \ - " xor ah, ah " \ - " int 10h " ; +#pragma aux clrscr=\ + " mov ah, 0fh "\ + " int 10h "\ + " xor ah, ah "\ + " int 10h "; + //from http://stackoverflow.com/questions/18425748/gotoxy-function-using-printf-s-position inline void gotoxy(int x,int y) { diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c index b92facef..83e20b85 100755 --- a/src/lib/16_tail.c +++ b/src/lib/16_tail.c @@ -646,10 +646,11 @@ void Quit (global_game_variables_t *gvar, char *error) //=========================================================================== -#ifndef __WATCOMC__ -char global_temp_status_text[512]; -char global_temp_status_text2[512]; -#else +//#ifndef __WATCOMC__ +//char global_temp_status_text[512]; +//char global_temp_status_text2[512]; +//#else +#ifdef __WATCOMC__ // // for mary4 (XT) // this is from my XT's BIOS