From: sparky4 Date: Mon, 29 Jun 2015 07:24:00 +0000 (-0500) Subject: wwww inputtest works good~ X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=3267427b850b84f59a555c07deec6656abdb776e;p=16.git wwww inputtest works good~ modified: 16.LIB modified: inputest.exe modified: src/inputest.c modified: src/lib/16_in.c modified: src/lib/16_in.h --- diff --git a/16.LIB b/16.LIB index 266271d9..56c3dbd4 100644 Binary files a/16.LIB and b/16.LIB differ diff --git a/inputest.exe b/inputest.exe index 91329f9c..0ac3e6a6 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/src/inputest.c b/src/inputest.c index 98815cc6..5df1f39f 100644 --- a/src/inputest.c +++ b/src/inputest.c @@ -28,6 +28,7 @@ void main(int argc, char *argv[]) { player_t player[MaxPlayers]; + //extern struct inconfig inpu; IN_Startup(); IN_Default(0,&player,ctrl_Joystick); diff --git a/src/lib/16_in.c b/src/lib/16_in.c index 6d8c1aba..55afb211 100644 --- a/src/lib/16_in.c +++ b/src/lib/16_in.c @@ -60,8 +60,6 @@ struct inconfig JoypadDef JoypadDefs[MaxPads]; } inpu; -//struct inconfig in; - //inpu.KbdDefs = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/}; /* diff --git a/src/lib/16_in.h b/src/lib/16_in.h index 352d87b2..410831ad 100644 --- a/src/lib/16_in.h +++ b/src/lib/16_in.h @@ -208,13 +208,34 @@ typedef struct ControlType Controls; } player_t; +/* +============================================================================= + + GLOBAL VARIABLES + +============================================================================= +*/ +/*extern struct inconfig +{ + boolean MousePresent; + boolean JoysPresent[MaxJoys]; + boolean JoyPadPresent[MaxPads]; + boolean Keyboard[NumCodes]; + boolean Paused; + char LastASCII; + ScanCode LastScan; + + KeyboardDef KbdDefs[MaxKbds]; + JoystickDef JoyDefs[MaxJoys]; + JoypadDef JoypadDefs[MaxPads]; +} inpu;*/ + #ifdef DEMO0 static Demo DemoMode = demo_Off; static byte /*_seg*/ *DemoBuffer; static word DemoOffset,DemoSize; #endif -//extern struct inconfig in; extern dword far* clockdw; // Internal routines