ok made the logging handle into to global variables struct handle!

	deleted:    DEBUG.16
	deleted:    HEAP.16
	deleted:    MMDUMP.16
	deleted:    PROFILE.16
	modified:   exmmtest.exe
	modified:   scroll.exe
	modified:   src/exmmtest.c
	modified:   src/lib/16_ca.c
	modified:   src/lib/16_ca.h
	modified:   src/lib/16_hc.c
	modified:   src/lib/16_hc.h
	modified:   src/lib/16_head.h
	modified:   src/lib/16_mm.c
	modified:   src/lib/16_mm.h

diff --git a/DEBUG.16 b/DEBUG.16
deleted file mode 100644 (file)
index 7eaa3cc..0000000
--- a/DEBUG.16
+++ /dev/null
@@ -1,18 +0,0 @@
-0      Size:5546       Owner:0x0\r
-0      Size:5546       Owner:0x0\r
-15aa   Size:256        Owner:0x351e\r
-Seg:16aa       Size:273        Owner:0x857a\r
-Seg:1cf8       Size:49 Owner:0x0\r
-Seg:ad29       Size:8920       Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:4294967263 Owner:0x0\r
-Seg:d022       Size:419        Owner:0x0\r
-Seg:e000       Size:4294909951 Owner:0x0\r

diff --git a/HEAP.16 b/HEAP.16
deleted file mode 100644 (file)
index 7a50a81..0000000
--- a/HEAP.16
+++ /dev/null
@@ -1,45 +0,0 @@
-\r
-       == default ==\r
-\r
-  USED block at 1d1a0016 of size 136\r
-  USED block at 1d1a009e of size 66\r
-  FREE block at 1d1a00e0 of size 18\r
-  USED block at 1d1a00f2 of size 20\r
-  FREE block at 1d1a0106 of size 7926\r
-OK - end of heap\r
-\r
-       == near ==\r
-\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-OK - end of heap\r
-\r
-       == far ==\r
-\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-  USED block at 0 of size 0\r
-OK - end of heap\r
-\r
-Memory Type         Total      Used       Free\r
-----------------  --------   --------   --------\r
-Default                   8166 222     7944\r
-Near              31318        862     30456\r
-Far               8166 222     7944\r
-----------------  --------   --------   --------\r
-coreleft = 30454\r
-farcoreleft = 38202\r
-GetFreeSize = 7768\r
-GetNearFreeSize = 30456\r
-GetFarFreeSize = 7768\r
-memavl = 30454\r
-stackavail = 11049\r

diff --git a/MMDUMP.16 b/MMDUMP.16
deleted file mode 100644 (file)
index 58c6845..0000000
Binary files a/MMDUMP.16 and /dev/null differ

diff --git a/PROFILE.16 b/PROFILE.16
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/exmmtest.exe b/exmmtest.exe
index 72f080b382981360b59fdf6a68fd3d0c676288f9..64f660ace47e5e1e43485bc2e4cac9faa46a35d7 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index a1a636ad2a85c98859964bb700c3960234792e76..1e15ab21b8a82ea217b77896f7da9744d85b198b 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 82cc6d37c6c6b4307bb177fe728a7a6101cc7a68..4d8ca6c177549bd4b63fce1383c24f55a6ab032f 100644 (file)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -42,6 +42,7 @@
 void\r
 main(int argc, char *argv[])\r
 {\r
+       global_game_variables_t gvar;\r
        mminfo_t mm; mminfotype mmi;\r
 #ifdef __WATCOMC__\r
        __segment sega;\r
@@ -90,7 +91,7 @@ main(int argc, char *argv[])
        MM_Startup(&mm, &mmi);\r
        //PM_Startup();\r
        //PM_UnlockMainMem();\r
-       CA_Startup();\r
+       CA_Startup(&gvar);\r
        printf("                done!\n");\r
        printf("&main()=        %Fp\n", *argv[0]);\r
        printf("bigbuffer=      %Fp\n", bigbuffer);\r
@@ -124,7 +125,7 @@ main(int argc, char *argv[])
        getch();\r
        //++++modexEnter();\r
        //++++modexShowPage(&screen);\r
-       MM_ShowMemory(&mm);\r
+       MM_ShowMemory(&gvar, &mm);\r
        //getch();\r
        MM_DumpData(&mm);\r
        //++++modexLeave();\r
@@ -134,7 +135,7 @@ main(int argc, char *argv[])
        MM_FreePtr(&bigbuffer, &mm);\r
 #endif\r
        //PM_Shutdown();\r
-       CA_Shutdown();\r
+       CA_Shutdown(&gvar);\r
        MM_Shutdown(&mm);\r
        printf("                done!\n");\r
 #ifdef FILERL\r
@@ -153,7 +154,7 @@ main(int argc, char *argv[])
        //getch();\r
 //     printf("\n");\r
 #ifdef __WATCOMC__\r
-       heapdump();\r
+       heapdump(&gvar);\r
 #endif\r
        //printf("core left:                    %lu\n", (dword)_coreleft());\r
        //printf("far core left:                        %lu\n", (dword)_farcoreleft());\r

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index d1ab94a7ad1c4104366985ed31beab332f6d98e4..abeffbfd76abf954c813be979346408af8b49f63 100644 (file)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -79,8 +79,6 @@ void          _seg    *grsegs[NUMCHUNKS];
 byte           far     grneeded[NUMCHUNKS];\r
 byte           ca_levelbit,ca_levelnum;*/\r
 \r
-int                    profilehandle,debughandle;\r
-\r
 void   (*drawcachebox)         (char *title, unsigned numcache);\r
 void   (*updatecachebox)       (void);\r
 void   (*finishcachebox)       (void);\r
@@ -176,15 +174,15 @@ long GRFILEPOS(int c)
 =\r
 ============================\r
 */\r
-void CA_OpenDebug(void)\r
+void CA_OpenDebug(global_game_variables_t *gvar)\r
 {\r
        unlink("debug.16");\r
-       debughandle = open("debug.16", O_CREAT | O_WRONLY | O_TEXT);\r
+       gvar->handle.debughandle = open("debug.16", O_CREAT | O_WRONLY | O_TEXT);\r
 }\r
 \r
-void CA_CloseDebug(void)\r
+void CA_CloseDebug(global_game_variables_t *gvar)\r
 {\r
-       close(debughandle);\r
+       close(gvar->handle.debughandle);\r
 }\r
 \r
 \r
@@ -1079,11 +1077,11 @@ asm     mov     ds,ax
 ======================\r
 */\r
 \r
-void CA_Startup(void)\r
+void CA_Startup(global_game_variables_t *gvar)\r
 {\r
 #ifdef PROFILE\r
        unlink("profile.16");\r
-       profilehandle = open("profile.16", O_CREAT | O_WRONLY | O_TEXT);\r
+       gvar->handle.profilehandle = open("profile.16", O_CREAT | O_WRONLY | O_TEXT);\r
 #endif\r
 /*++++\r
 // MDM begin - (GAMERS EDGE)\r
@@ -1141,10 +1139,10 @@ void CA_Startup(void)
 ======================\r
 */\r
 \r
-void CA_Shutdown(void)\r
+void CA_Shutdown(global_game_variables_t *gvar)\r
 {\r
 #ifdef PROFILE\r
-       close(profilehandle);\r
+       close(gvar->handle.profilehandle);\r
 #endif\r
 /*++++\r
        close(maphandle);\r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index 77809387576c8437e4e1978adf7b33614dbc011c..d0984fd6bb43f31c464132d089b4dc072633ec7a 100644 (file)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -36,7 +36,7 @@
 //#define AUDIOHEADERLINKED\r
 \r
 //#define NUMMAPS              39\r
-//#define MAPPLANES            3
+//#define MAPPLANES            3\r
 #define PROFILE\r
 \r
 //===========================================================================\r
@@ -64,7 +64,7 @@ extern        byte            ca_levelbit,ca_levelnum;
 \r
 extern char            *titleptr[8];*/\r
 \r
-extern int                     profilehandle,debughandle;\r
+//extern\r
 \r
 //\r
 // hooks for custom cache dialogs\r
@@ -80,21 +80,21 @@ extern      void    (*finishcachebox)       (void);
 //void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,unsigned width, unsigned height, unsigned pixshift, boolean domask);\r
 \r
 //===========================================================================\r
-
-void CA_OpenDebug (void);\r
-void CA_CloseDebug (void);
+\r
+void CA_OpenDebug (global_game_variables_t *gvar);\r
+void CA_CloseDebug (global_game_variables_t *gvar);\r
 boolean CA_FarRead (int handle, byte huge *dest, dword length, mminfo_t *mm);\r
-boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm);
+boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm);\r
 \r
 boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm);\r
-boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi);
+boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi);\r
 \r
 //long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
 \r
 //void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);\r
 \r
-void CA_Startup (void);\r
-void CA_Shutdown (void);\r
+void CA_Startup (global_game_variables_t *gvar);\r
+void CA_Shutdown (global_game_variables_t *gvar);\r
 \r
 //void CA_CacheAudioChunk (int chunk);\r
 //void CA_LoadAllSounds (void);\r

diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c
index d72b334d89b1f76832e0eafa0f3d2ed57c444833..afe6e3101dfc6a9ec1003aebdb29b2fb0171eb12 100644 (file)
--- a/src/lib/16_hc.c
+++ b/src/lib/16_hc.c
@@ -25,8 +25,6 @@
 
 #include "src/lib/16_hc.h"
 
-int heaphandle;
-
 #ifdef __BORLANDC__
 void * LargestFreeBlock(size_t* Size)
 #endif
@@ -390,17 +388,17 @@ size_t GetNearFreeSize(void)
        return nh_free;
 }
 
-void heapdump(void)
+void heapdump(global_game_variables_t *gvar)
 {
        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;
        byte    scratch[1024],str[16];
 
-       HC_OpenDebug();
+       HC_OpenDebug(gvar);
 
        strcpy(scratch,"\n      == default ==\n\n");
-       write(heaphandle,scratch,strlen(scratch));
+       write(gvar->handle.heaphandle,scratch,strlen(scratch));
        h_info._pentry = NULL;
        h_free=0; h_total=0; h_used=0;
        for(;;) {
@@ -410,13 +408,13 @@ void heapdump(void)
                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(heaphandle,scratch,strlen(scratch));
+               write(gvar->handle.heaphandle,scratch,strlen(scratch));
        }
-       heapstat(heap_status, &scratch);
+       heapstat(gvar, heap_status, &scratch);
 
        //near
        strcpy(scratch,"\n      == near ==\n\n");
-       write(heaphandle,scratch,strlen(scratch));
+       write(gvar->handle.heaphandle,scratch,strlen(scratch));
        nh_info._pentry = NULL;
        nh_free=0; nh_total=0; nh_used=0;
        for(;;) {
@@ -429,13 +427,13 @@ nh_info._pentry, nh_info._size );*/
                if((nh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="FREE") nh_free += nh_info._size;
                if((nh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="USED") nh_used += nh_info._size;
                nh_total += nh_info._size;
-               write(heaphandle,scratch,strlen(scratch));
+               write(gvar->handle.heaphandle,scratch,strlen(scratch));
        }
-       heapstat(heap_status, &scratch);
+       heapstat(gvar, heap_status, &scratch);
 
        //far
        strcpy(scratch,"\n      == far ==\n\n");
-       write(heaphandle,scratch,strlen(scratch));
+       write(gvar->handle.heaphandle,scratch,strlen(scratch));
        fh_info._pentry = NULL;
        fh_free=0; fh_total=0; fh_used=0;
        for(;;) {
@@ -448,9 +446,9 @@ fh_info._pentry, fh_info._size );*/
                if((fh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="FREE") fh_free += fh_info._size;
                if((fh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="USED") fh_used += fh_info._size;
                fh_total += fh_info._size;
-               write(heaphandle,scratch,strlen(scratch));
+               write(gvar->handle.heaphandle,scratch,strlen(scratch));
        }
-       heapstat(heap_status, &scratch);
+       heapstat(gvar, heap_status, &scratch);
 
        strcpy(scratch,"\n");
        strcat(scratch,kittengets(2,0,"Memory Type         Total      Used       Free\n"));
@@ -466,11 +464,11 @@ fh_info._pentry, fh_info._size );*/
        strcat(scratch,"GetFarFreeSize = ");    ultoa((dword)GetFarFreeSize(),str,10);  strcat(scratch,str);    strcat(scratch,"\n");
        strcat(scratch,"memavl = ");                    ultoa((dword)_memavl(),str,10);                 strcat(scratch,str);    strcat(scratch,"\n");
        strcat(scratch,"stackavail = ");                ultoa((dword)stackavail(),str,10);              strcat(scratch,str);    strcat(scratch,"\n");
-       write(heaphandle,scratch,strlen(scratch));
-       HC_CloseDebug();
+       write(gvar->handle.heaphandle,scratch,strlen(scratch));
+       HC_CloseDebug(gvar);
 }
 
-void heapstat(int heap_status, byte *str)
+void heapstat(global_game_variables_t *gvar, int heap_status, byte *str)
 {
        switch( heap_status ) {
                case _HEAPEND:
@@ -489,7 +487,7 @@ void heapstat(int heap_status, byte *str)
                case _HEAPBADNODE:
                        strcpy((str),"ERROR - bad node in heap\n");
        }
-       write(heaphandle,(str),strlen((str)));
+       write(gvar->handle.heaphandle,(str),strlen((str)));
 }
 
 void heapstat0(int heap_status)
@@ -500,7 +498,6 @@ void heapstat0(int heap_status)
                break;
                case _HEAPEMPTY:
                        //printf("OK - heap is empty\n");
-
                break;
                case _HEAPBADBEGIN:
                        printf("ERROR - heap is damaged\n");
@@ -522,13 +519,13 @@ void heapstat0(int heap_status)
 =
 ============================
 */
-void HC_OpenDebug()
+void HC_OpenDebug(global_game_variables_t *gvar)
 {
        unlink("heap.16");
-       heaphandle = open("heap.16", O_CREAT | O_WRONLY | O_TEXT);
+       gvar->handle.heaphandle = open("heap.16", O_CREAT | O_WRONLY | O_TEXT);
 }
 
-void HC_CloseDebug()
+void HC_CloseDebug(global_game_variables_t *gvar)
 {
-       close(heaphandle);
+       close(gvar->handle.heaphandle);
 }

diff --git a/src/lib/16_hc.h b/src/lib/16_hc.h
index db0265a82832eba45a4496a59459a6771fd90be0..6e947beeab5cb5df542b5775b6946d1bac4fb1b8 100644 (file)
--- a/src/lib/16_hc.h
+++ b/src/lib/16_hc.h
@@ -28,8 +28,6 @@
 
 #include "src/lib/16_head.h"
 
-extern int heaphandle;
-
 #ifdef __BORLANDC__
 void * LargestFreeBlock(size_t* Size);
 #endif
@@ -46,11 +44,11 @@ size_t _hugecoreleft(void);
 size_t GetFreeSize(void);
 size_t GetFarFreeSize(void);
 size_t GetNearFreeSize(void);
-void heapdump(void);
-void heapstat(int heap_status, byte *str);
+void heapdump(global_game_variables_t *gvar);
+void heapstat(global_game_variables_t *gvar, int heap_status, byte *str);
 void heapstat0(int heap_status);
 
-void HC_OpenDebug();
-void HC_CloseDebug();
+void HC_OpenDebug(global_game_variables_t *gvar);
+void HC_CloseDebug(global_game_variables_t *gvar);
 
 #endif /* __16HC__ */

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 39f16ae8662149c37856272310890e773a409147..665c4fb23e3490338e195bda7bf0e597474789ab 100644 (file)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -176,6 +176,13 @@ typedef void __based(__self) * memptr;
 #ifdef __BORLANDC__\r
 typedef void _seg * memptr;\r
 #endif\r
+\r
+typedef struct\r
+{\r
+       int                     profilehandle,debughandle;\r
+       int heaphandle;\r
+} handle_t;\r
+\r
 typedef struct\r
 {\r
        int old_mode;   //old video mode before game!\r
@@ -183,8 +190,7 @@ typedef struct
        clock_t t;\r
        dword tiku;\r
        word far* clock;\r
-       //handles for log files of the game gose here if wwww\r
-       //int heaphandle;\r
+       handle_t handle;        //handles for file logging\r
 } global_game_variables_t;\r
 \r
 /* local function */\r
@@ -194,7 +200,7 @@ long int filesize(FILE *fp);
 void printmeminfoline(byte *strc, const byte *pee, size_t h_total, size_t h_used, size_t h_free);\r
 int US_CheckParm(char *parm,char **strings);\r
 \r
-extern void CA_OpenDebug (void);\r
-extern void CA_CloseDebug (void);\r
+extern void CA_OpenDebug (global_game_variables_t *gvar);\r
+extern void CA_CloseDebug (global_game_variables_t *gvar);\r
 \r
 #endif/*_LIBHEAD_H_*/\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index ba29d60c72b9d5191701f14c664441a37f7a93a4..78f00337ac37398ad8372feb26e1361ee2969b0b 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1011,7 +1011,7 @@ printf("\n");
        if (mm->bombonerror)
        {
 #ifdef __WATCOMC__
-               heapdump();
+               //heapdump();
 #endif
                printf(OUT_OF_MEM_MSG,(size-mmi->nearheap));
                printf("for stability reasons the program will shut down! wwww\n");
@@ -1264,7 +1264,7 @@ void MM_SortMem(mminfo_t *mm)
 =====================
 */
 
-void MM_ShowMemory(/*page_t *page, */mminfo_t *mm)
+void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm)
 {
        mmblocktype huge *scan;
 //++++ word color;
@@ -1283,7 +1283,7 @@ void MM_ShowMemory(/*page_t *page, */mminfo_t *mm)
 
        end = -1;
 
-CA_OpenDebug ();
+CA_OpenDebug (gvar);
 
 //++++ chx=0;
 //++++ chy=0;
@@ -1299,7 +1299,7 @@ CA_OpenDebug ();
                if(scan->start<=end)
                {
                        //printf(");
-                       write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
+                       write(gvar->handle.debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
                        //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n");
                        return;
                }
@@ -1348,7 +1348,7 @@ owner = (unsigned)scan->useptr;
 ultoa (owner,str,16);
 strcat (scratch,str);
 strcat (scratch,"\n");
-write(debughandle,scratch,strlen(scratch));
+write(gvar->handle.debughandle,scratch,strlen(scratch));
 //modexprint(page, chx, chy, 1, 0, 24, &scratch);
 //++++chy+=4;
 //fprintf(stdout, "%s", scratch);
@@ -1357,7 +1357,7 @@ write(debughandle,scratch,strlen(scratch));
                scan = scan->next;
        }
 
-CA_CloseDebug ();
+CA_CloseDebug (gvar);
 
 //++++mh       IN_Ack();
 //**** VW_SetLineWidth(64);

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 49a943fc25e9fd32438b45d99e191235c88410d1..2e01230268ee5830f61615d6a210fe389b11afd4 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -187,7 +187,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm);
 void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm);
 void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm);
 void MM_SortMem(mminfo_t *mm);
-void MM_ShowMemory(/*page_t *page, */mminfo_t *mm);
+void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm);
 void MM_DumpData(mminfo_t *mm);
 dword MM_UnusedMemory(mminfo_t *mm);
 dword MM_TotalFree(mminfo_t *mm);