From: sparky4 Date: Sat, 27 Jun 2015 23:31:00 +0000 (-0500) Subject: wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=3a9d099252b5c317c6ef40c1d7e8541400159cb6;p=16.git wwww modified: 16.LIB modified: 16.exe modified: exmmtest.exe modified: fonttest.exe modified: inputest.exe modified: maptest.exe modified: maptest0.exe modified: pcxtest.exe modified: scroll.exe modified: src/lib/16_in.c modified: src/lib/16_in.h modified: test.exe modified: test2.exe --- diff --git a/16.LIB b/16.LIB index a0c5426f..0cafbb62 100644 Binary files a/16.LIB and b/16.LIB differ diff --git a/16.exe b/16.exe index 7c2c48b7..43d3b6dd 100644 Binary files a/16.exe and b/16.exe differ diff --git a/exmmtest.exe b/exmmtest.exe index f949a05e..35510536 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/fonttest.exe b/fonttest.exe index 9fd9ea35..ac1cda24 100644 Binary files a/fonttest.exe and b/fonttest.exe differ diff --git a/inputest.exe b/inputest.exe index 4e470c4d..bc272097 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/maptest.exe b/maptest.exe index 2a6a6dd5..a846d026 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/maptest0.exe b/maptest0.exe index 12dda10a..815756c6 100644 Binary files a/maptest0.exe and b/maptest0.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index 57294369..80badb00 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/scroll.exe b/scroll.exe index 4180b96f..9da91bdd 100644 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/src/lib/16_in.c b/src/lib/16_in.c index 28d79e71..e3832dcf 100644 --- a/src/lib/16_in.c +++ b/src/lib/16_in.c @@ -37,6 +37,27 @@ #include "src/lib/16_in.h" +/* +============================================================================= + + GLOBAL VARIABLES + +============================================================================= +*/ +// Global variables + boolean JoystickCalibrated=false; // MDM (GAMERS EDGE) - added + ControlType ControlTypeUsed; // MDM (GAMERS EDGE) - added + boolean Keyboard[NumCodes]; + boolean Paused; + char LastASCII; + ScanCode LastScan; + + //KeyboardDef KbdDefs = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51}; + JoystickDef JoyDefs[MaxJoys]; + ControlType Controls[MaxPlayers]; + + dword MouseDownCount; + // Internal routines /////////////////////////////////////////////////////////////////////////// // diff --git a/src/lib/16_in.h b/src/lib/16_in.h index b39e1a5b..7cc14372 100644 --- a/src/lib/16_in.h +++ b/src/lib/16_in.h @@ -205,21 +205,21 @@ static boolean MousePresent; static boolean JoysPresent[MaxJoys]; static boolean JoyPadPresent; - // Global variables - static boolean JoystickCalibrated=false; // MDM (GAMERS EDGE) - added - static ControlType ControlTypeUsed; // MDM (GAMERS EDGE) - added + extern boolean JoystickCalibrated; // MDM (GAMERS EDGE) - added + extern ControlType ControlTypeUsed; // MDM (GAMERS EDGE) - added - static boolean Keyboard[NumCodes]; - static boolean Paused; - static char LastASCII; - static ScanCode LastScan; + extern boolean Keyboard[NumCodes]; + extern boolean Paused; + extern char LastASCII; + extern ScanCode LastScan; + //extern KeyboardDef KbdDefs[]; static KeyboardDef KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51}; - static JoystickDef JoyDefs[MaxJoys]; - static ControlType Controls[MaxPlayers]; + extern JoystickDef JoyDefs[MaxJoys]; + extern ControlType Controls[MaxPlayers]; - static dword MouseDownCount; + extern dword MouseDownCount; #ifdef DEMO0 static Demo DemoMode = demo_Off; diff --git a/test.exe b/test.exe index 262cd022..c5c68fdb 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index c9f12fc1..0b074538 100644 Binary files a/test2.exe and b/test2.exe differ