[16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/src/exmmtest.c b/src/exmmtest.c
index e50dfdadc132919755c2bc13a3eee47b2639a516..11cdf7cfe77fb17f4422ddf193c3bf7acc9a26ff 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -223,13 +223,13 @@ PRINTBB; printf("\n\npress any key to continue!\n"); getch();
 #endif\r
 #endif //filereadload\r
 \r
-/*\r
+\r
 #ifdef __WATCOMC__\r
-       IN_Shutdown(&gvar);\r
-       ShapeTest (&gvar);\r
        IN_Startup(&gvar);\r
+       ShapeTest (&gvar);\r
+       IN_Shutdown(&gvar);\r
 #endif\r
-*/\r
+\r
 \r
        DebugMemory_(&gvar, 1);\r
        MM_DumpData(&gvar);\r

diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
index 576f492b1f47df9f1b8521dbca583b04f5278eff..db8f71a10365279798763005f247c2be657b22b2 100755 (executable)
--- a/src/lib/16_dbg.c
+++ b/src/lib/16_dbg.c
@@ -126,9 +126,9 @@ static      char    buf[10];
 //             US_Print(" Page #");\r
 //             US_PrintUnsigned(i);\r
                printf(" Page #%u", i);\r
-               if (i < (gvar->pm.fi.PMSpriteStart))\r
+//++           if (i < (gvar->pm.fi.PMSpriteStart))\r
 //                     US_Print(" (Wall)");\r
-                       printf(" (Wall)");\r
+//++                   printf(" (Wall)");\r
 /*             else if (i < (gvar->pm.fi.PMSoundStart))\r
 //                     US_Print(" (Sprite)");\r
                        printf(" (Sprite)");\r
@@ -256,10 +256,14 @@ static    char    buf[10];
 \r
 //             VW_UpdateScreen();\r
 \r
-//             while (!(scan = IN_GetLastScan()))\r
-                       scan = *IN_GetScanName(scan);\r
+               while (!(scan = gvar->in.inst->LastScan))\r
+               {\r
+               }\r
+//                     scan = *IN_GetScanName(scan);\r
 //                     SD_Poll();\r
 \r
+if(IN_KeyDown(sc_Escape)) break;\r
+\r
                IN_ClearKey(scan);\r
                switch (scan)\r
                {\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 98ecb70d117a330213f9fb00a974dda1463ecbbd..14086bd8909381c57da08fa8836a4a881efbc708 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -78,15 +78,21 @@ static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 extern "C" {\r
 #endif\r
 \r
-static struct instat {\r
-       boolean         CapsLock;\r
+/*static struct instat {\r
+       boolean         CapsLock;\r
        ScanCode        CurCode,LastCode;\r
 \r
        boolean         Keyboard[NumCodes];\r
        boolean         Paused;\r
        char            LastASCII;\r
        ScanCode        LastScan;\r
-} inst;\r
+} inst;*/\r
+\r
+//the def stuff is need fix warnings\r
+#ifndef INSTDEFED\r
+#define INSTDEFED\r
+static inst_t inst;\r
+#endif\r
 \r
 static byte        far ASCIINames[] =          // Unshifted ASCII for scan codes\r
                                        {\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 27f43adc24866c90574f5ad96b5f33c56f8f0d35..08b9699624d2e35b85c6abcaa82bc49d6794ae71 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -287,27 +287,31 @@ typedef   struct          {
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\r
 \r
+typedef struct instat {\r
+       boolean         CapsLock;\r
+       ScanCode        CurCode,LastCode;\r
+\r
+       boolean         Keyboard[NumCodes];\r
+       boolean         Paused;\r
+       char            LastASCII;\r
+       ScanCode        LastScan;\r
+} inst_t;\r
+\r
 typedef struct// inconfig\r
 {\r
        boolean         IN_Started;\r
-//     boolean         CapsLock;\r
-//     ScanCode        CurCode,LastCode;\r
 //\r
 // configuration variables\r
 //\r
-//     boolean         Keyboard[NumCodes],\r
        boolean         JoysPresent[MaxJoys],\r
                                        MousePresent,\r
                                        JoyPadPresent;\r
 \r
 //     Global variables\r
-//     boolean         Paused;\r
-//     char            LastASCII;\r
-//     ScanCode        LastScan;\r
-\r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-       struct  instat  *inst;\r
+       //struct        instat  *inst;\r
+       inst_t  *inst;\r
 } in_info_t;\r
 \r
 //==========================================================================\r