From: sparky4 Date: Mon, 29 Jun 2015 08:22:25 +0000 (-0500) Subject: wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=e26d9f2f0a5705ab73e9b531000f1fad8a1a5466;p=16.git wwww renamed: 16/inputest.exe -> 16/INPUTEST.EXE modified: 16/src/inputest.c modified: 16/src/lib/16_in.c modified: 16/src/lib/16_in.h --- diff --git a/16/inputest.exe b/16/INPUTEST.EXE similarity index 100% rename from 16/inputest.exe rename to 16/INPUTEST.EXE diff --git a/16/src/inputest.c b/16/src/inputest.c index 5df1f39f..c12b19f1 100644 --- a/16/src/inputest.c +++ b/16/src/inputest.c @@ -28,6 +28,7 @@ void main(int argc, char *argv[]) { player_t player[MaxPlayers]; + //inconfig inpu; //extern struct inconfig inpu; IN_Startup(); diff --git a/16/src/lib/16_in.c b/16/src/lib/16_in.c index 55afb211..97014426 100644 --- a/16/src/lib/16_in.c +++ b/16/src/lib/16_in.c @@ -55,11 +55,12 @@ struct inconfig char LastASCII; ScanCode LastScan; - KeyboardDef KbdDefs[MaxKbds];// = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/}; + KeyboardDef KbdDefs[MaxKbds]; JoystickDef JoyDefs[MaxJoys]; JoypadDef JoypadDefs[MaxPads]; } inpu; +//extern inconfig inpu; //inpu.KbdDefs = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/}; /* diff --git a/16/src/lib/16_in.h b/16/src/lib/16_in.h index 410831ad..9e57fe83 100644 --- a/16/src/lib/16_in.h +++ b/16/src/lib/16_in.h @@ -215,7 +215,7 @@ typedef struct ============================================================================= */ -/*extern struct inconfig +/*typedef struct { boolean MousePresent; boolean JoysPresent[MaxJoys]; @@ -228,7 +228,7 @@ typedef struct KeyboardDef KbdDefs[MaxKbds]; JoystickDef JoyDefs[MaxJoys]; JoypadDef JoypadDefs[MaxPads]; -} inpu;*/ +} inconfig;*/ #ifdef DEMO0 static Demo DemoMode = demo_Off; @@ -236,6 +236,7 @@ typedef struct static word DemoOffset,DemoSize; #endif +//extern inconfig inpu; extern dword far* clockdw; // Internal routines