wwww

diff --git a/TC0000.SWP b/TC0000.SWP
new file mode 100755 (executable)
index 0000000..0e56afc
Binary files /dev/null and b/TC0000.SWP differ

diff --git a/bcexmm.dsk b/bcexmm.dsk
index e1d0305..37ef394 100755 (executable)
Binary files a/bcexmm.dsk and b/bcexmm.dsk differ

diff --git a/bcexmm.prj b/bcexmm.prj
index bf1d7a4..17f3fb0 100755 (executable)
Binary files a/bcexmm.prj and b/bcexmm.prj differ

diff --git a/src/exmmtest.c b/src/exmmtest.c
index fc4eb11..d973ba5 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -87,7 +87,10 @@ main(int argc, char *argv[])
        //file name //\r
 \r
        gvar.mm.mmstarted=0;\r
+\r
+#ifdef __DEBUG_PM__\r
        dbg_debugpm=1;  //debug pm\r
+#endif\r
 \r
        //PRINTBB\r
        if(argv[1]){ bakapee1 = argv[1];\r
@@ -101,13 +104,17 @@ main(int argc, char *argv[])
        MM_Startup(&gvar);\r
        //printf("ok\n");\r
 //#ifdef __WATCOMC__\r
+#ifdef __DEBUG_PM__\r
        if(dbg_debugpm>0)\r
        {\r
+#endif\r
                PM_Startup(&gvar);\r
                //printf("pmstarted ok\n");\r
                //PM_CheckMainMem(&gvar);\r
                PM_UnlockMainMem(&gvar);\r
+#ifdef __DEBUG_PM__\r
        }\r
+#endif\r
 //#endif\r
        CA_Startup(&gvar);\r
 //     printf("                done!\n");\r
@@ -157,7 +164,9 @@ for(w=0;w<2;w++)
        //printf("bakapee2=%s\n", bakapee2);\r
        MM_FreePtr(&bigbuffer, &gvar);\r
 //#ifdef __WATCOMC__\r
+#ifdef __DEBUG_PM__\r
        if(dbg_debugpm>0)\r
+#endif\r
                PM_Shutdown(&gvar);\r
 //#endif\r
        CA_Shutdown(&gvar);\r

diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
index 7766a1d..13d5846 100755 (executable)
--- a/src/lib/16_dbg.c
+++ b/src/lib/16_dbg.c
@@ -10,6 +10,15 @@
 unsigned char _DEBUG_INITed = 0;\r
 struct info_8250 *_DEBUG_uart = NULL;\r
 \r
+#ifdef __DEBUG__\r
+#ifdef __DEBUG_PM__\r
+boolean dbg_debugpm=0;\r
+#endif\r
+#ifdef __DEBUG_InputMgr__\r
+boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;\r
+#endif\r
+#endif\r
+\r
 int _DEBUG_INIT() {\r
        if (!_DEBUG_INITed) {\r
                unsigned int i;\r

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index d02abb3..1454e09 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -2,10 +2,19 @@
 #ifndef _SRC_LIB_16_DBG\r
 #define _SRC_LIB_16_DBG\r
 \r
-#define __DEBUG__\r
+//#define __DEBUG__\r
 //#define __DEBUG_PM__\r
 //#define __DEBUG_MM__\r
 \r
+#ifdef __DEBUG__\r
+#ifdef __DEBUG_PM__\r
+extern boolean dbg_debugpm=0;\r
+#endif\r
+#ifdef __DEBUG_InputMgr__\r
+extern boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;\r
+#endif\r
+#endif\r
+\r
 # ifdef DEBUGSERIAL\r
 #  include <hw/8250/8250.h>\r
 \r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 0d3b29c..69324ee 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,10 +38,6 @@
 \r
 #include "src/lib/16_in.h"\r
 \r
-#ifdef __DEBUG_InputMgr__\r
-boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;\r
-#endif\r
-\r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 /*\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 3c10463..7ee2c61 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -36,10 +36,6 @@
 #include "src/lib/16_enti.h"\r
 //#include "src/lib/bitmap.h"  //old format\r
 #endif\r
-#ifdef __DEBUG__\r
-#define        __DEBUG_InputMgr__\r
-extern boolean dbg_testkeyin,dbg_testcontrolnoisy;\r
-#endif\r
 \r
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index b68eea9..b160ac6 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -30,7 +30,6 @@
 \r
 #ifdef __DEBUG__               // 1 == Debug/Dev  ;  0 == Production/final\r
 #define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%lu bytes\n"\r
-extern boolean dbg_debugpm;\r
 #else\r
 #define OUT_OF_MEM_MSG "\npee\n"\r
 #endif\r

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 7ecab1e..bf7ad82 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -29,10 +29,6 @@
 #include "src/lib/16_pm.h"\r
 #pragma hdrstop\r
 \r
-#ifdef __DEBUG__\r
-boolean dbg_debugpm=0;\r
-#endif\r
-\r
 //     Main Mem specific variables\r
        //boolean                       MainPresent;\r
 /*     memptr                  MainMemPages[PMMaxMainMem];\r

diff --git a/src/lib/16_pm.h b/src/lib/16_pm.h
index 4c015e9..567b953 100755 (executable)
--- a/src/lib/16_pm.h
+++ b/src/lib/16_pm.h
@@ -32,11 +32,10 @@
 #include "src/lib/16_hc.h"\r
 #include "src/lib/16_mm.h"\r
 #include "src/lib/16_ca.h"\r
-#include <dos.h>\r
-\r
-#ifdef __DEBUG__\r
-extern boolean dbg_debugpm;\r
+#ifdef __WATCOMC__\r
+#include "src/lib/16_dbg.h"\r
 #endif\r
+#include <dos.h>\r
 \r
 /*//   NOTE! PMPageSize must be an even divisor of EMSPageSize, and >= 1024\r
 #define        EMSPageSize             16384\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index d9d37b1..b22affd 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -29,8 +29,6 @@
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_in.h"\r
 \r
-extern boolean dbg_debugpm;\r
-\r
 void DebugMemory_(global_game_variables_t *gvar, boolean q);\r
 void Shutdown16(global_game_variables_t *gvar);\r
 void Startup16(global_game_variables_t *gvar);\r

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index a27b6b8..be0cdc9 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -342,7 +342,7 @@ typedef struct
 } global_game_variables_t;\r
 \r
 extern char global_temp_status_text[512];\r
-\r
+#ifdef __WATCOMC__\r
 #define EINVFMT EMFILE\r
-\r
+#endif\r
 #endif /* _TYPEDEFSTRUCT_H_ */\r

diff --git a/src/vrstest.c b/src/vrstest.c
index 743fe4a..d9ab0f7 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -52,8 +52,9 @@ void main() {
        word w=0;\r
 \r
        gvar.mm.mmstarted=0;\r
+#ifdef __DEBUG_PM__\r
        dbg_debugpm=1;\r
-\r
+#endif\r
        // DOSLIB: check our environment\r
        probe_dos();\r
 \r