====XMS MOSTLY translated but crashes EXMMTEST.EXE ====

diff --git a/MMDUMP.16B b/MMDUMP.16B
index a2763a1596e554e4e153a06f71fbf4a8a14339c7..9d3a83c8e9869fb47704f6dcc76d2adfa45d968b 100755 (executable)
Binary files a/MMDUMP.16B and b/MMDUMP.16B differ

diff --git a/bcexmm.exe b/bcexmm.exe
index ba460567b992edeea1a7849af7af7ffc8e663718..a116796f446687abe8b44020b18cd86bbf4e65f5 100755 (executable)
Binary files a/bcexmm.exe and b/bcexmm.exe differ

diff --git a/bcexmm.prj b/bcexmm.prj
index 4b0799a7369ff8792cca8f28e2ed2a70c5829ae8..5ffed8b28177732bf6350fcaaa272f4d4bcce33b 100755 (executable)
Binary files a/bcexmm.prj and b/bcexmm.prj differ

diff --git a/src/inputest.c b/src/inputest.c
index 62e2d8177b55a9fd0173487079b9f20bfc610eaa..be6ac4a2a725284c1f958afa1ada71b7fd4b86e5 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -30,8 +30,8 @@ main(int argc, char *argv[])
        global_game_variables_t gvar;\r
        player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
-       testkeyin=0;\r
-       testcontrolnoisy=1;\r
+       dbg_testkeyin=0;\r
+       dbg_testcontrolnoisy=1;\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick1);\r
        IN_SetControlType(0,&player,ctrl_Joystick1);\r
@@ -105,6 +105,6 @@ main(int argc, char *argv[])
        //printf("%u\n", in.Keyboard[sc_Escape]);\r
        printf("inputest.exe ");\r
        printf("version %s\n", VERSION);\r
-       printf("testkeyin=%u\n", testkeyin);\r
-       printf("testcontrolnoisy=%u\n", testcontrolnoisy);\r
+       printf("testkeyin=%u\n", dbg_testkeyin);\r
+       printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);\r
 }\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 85153939ccd443b05db0491f353dd635560297f5..8c0dbc695bd54210d249c3e8850c0b54a1c298d2 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,9 @@
 \r
 #include "src/lib/16_in.h"\r
 \r
-boolean testkeyin=0,testcontrolnoisy=0;\r
+#ifdef __DEBUG_InputMgr__\r
+boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;\r
+#endif\r
 \r
 /*\r
 =============================================================================\r
@@ -234,9 +236,9 @@ static      boolean special;
 \r
        if (INL_KeyHook && !special)\r
                INL_KeyHook();\r
-//#ifdef TESTKEYIN\r
-       if(testkeyin > 0) printf("%c    %u      [0x%x %u]       %u\n", c, c, k, k, inpu.Keyboard[k]);\r
-//endif\r
+#ifdef __DEBUG_InputMgr__\r
+       if(dbg_testkeyin > 0) printf("%c        %u      [0x%x %u]       %u\n", c, c, k, k, inpu.Keyboard[k]);\r
+#endif\r
        outp(0x20,0x20);\r
 }\r
 \r
@@ -881,7 +883,9 @@ register    KeyboardDef     *def;
                                                default:\r
                                                break;\r
                                        }\r
-                                       //if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c    ", dirchar(player[pn].pdir)); }\r
+#ifdef __DEBUG_InputMgr__\r
+                                       //if(dbg_testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c        ", dirchar(player[pn].pdir)); }\r
+#endif\r
                                }\r
                        }\r
                        //input from player\r
@@ -962,7 +966,8 @@ register    KeyboardDef     *def;
                }\r
        }\r
 #endif\r
-if(testcontrolnoisy > 0)\r
+#ifdef __DEBUG_InputMgr__\r
+if(dbg_testcontrolnoisy > 0)\r
 if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].q>1)\r
 {\r
        //printf("b1=%u b2=%u b3=%u b4=%u       ", player[pn].info.button0, player[pn].info.button1, player[pn].info.button2, player[pn].info.button3);\r
@@ -973,6 +978,7 @@ if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] |
        //else if(!realdelta) printf("%c%d %c%d %c%d %c%d", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);\r
        printf("\n");\r
 }\r
+#endif\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -1239,9 +1245,9 @@ void IN_ClearKey(byte code)
 \r
 boolean IN_qb(byte kee)\r
 {\r
-//#ifdef TESTKEYIN\r
-//     if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);\r
-//#endif\r
+#ifdef __DEBUG_InputMgr__\r
+//     if(dbg_testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);\r
+#endif\r
        if(inpu.Keyboard[kee]==true) return 1;\r
        else return 0;\r
 }\r

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