teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- input works again.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-04 20:29:07 +01:00
parent 25341c7221
commit bbf0a73471
27 changed files with 55 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/build/src/sdlayer.cpp
View file

@ -30,6 +30,7 @@
#include "i_specialpaths.h"
#include "inputstate.h"
#include "c_cvars.h"
#include "i_time.h"
#ifndef NETCODE_DISABLE
#include "enet.h"
#endif
@ -893,8 +894,6 @@ void joyScanDevices()
//
int32_t initinput(void)
{
int32_t i;
#if defined EDUKE32_OSX
// force OS X to operate in >1 button mouse mode so that LMB isn't adulterated
@ -1783,7 +1782,7 @@ int32_t handleevents_sdlcommon(SDL_Event *ev)
if (j < 0)
break;
event_t evt = { (ev->button.state == SDL_PRESSED)? EV_KeyDown : EV_KeyUp, 0, j};
event_t evt = { uint8_t((ev->button.state == SDL_PRESSED)? EV_KeyDown : EV_KeyUp), 0, (int16_t)j};
D_PostEvent(&evt);
break;
}
@ -1999,8 +1998,8 @@ int32_t handleevents_pollsdl(void)
if (j == -1) inputState.ClearKeysDown(); // Flush the entire keyboard state for the game when the console opens.
if (j <= 0) break; // Do not pass on to the game
event_t ev = { (uint8_t)ev.type == SDL_KEYUP? EV_KeyUp : EV_KeyDown, 0, (int16_t)code, (int16_t)keyvalue };
D_PostEvent(&ev);
event_t evt = { (uint8_t)(ev.type == SDL_KEYUP? EV_KeyUp : EV_KeyDown), 0, (int16_t)code, (int16_t)keyvalue };
D_PostEvent(&evt);
break;
}
@ -2010,13 +2009,13 @@ int32_t handleevents_pollsdl(void)
// This never sends keyup events. For the current code that should suffice
if (ev.wheel.y > 0)
{
event_t ev = { EV_KeyDown, 0, (int16_t)KEY_MWHEELUP };
D_PostEvent(&ev);
event_t evt = { EV_KeyDown, 0, (int16_t)KEY_MWHEELUP };
D_PostEvent(&evt);
}
if (ev.wheel.y < 0)
{
event_t ev = { EV_KeyDown, 0, (int16_t)KEY_MWHEELDOWN };
D_PostEvent(&ev);
event_t evt = { EV_KeyDown, 0, (int16_t)KEY_MWHEELDOWN };
D_PostEvent(&evt);
}
break;

6
source/common/console/c_bind.cpp
View file

@ -61,11 +61,11 @@ const char *KeyNames[NUM_KEYS] =
nullptr, "Escape", "1", "2", "3", "4", "5", "6", //00
"7", "8", "9", "0", "-", "=", "Backspace","Tab", //08
"Q", "W", "E", "R", "T", "Y", "U", "I", //10
"O", "P", "[", "]", "Enter", "Ctrl", "A", "S", //18
"O", "P", "[", "]", "Enter", "LCtrl", "A", "S", //18
"D", "F", "G", "H", "J", "K", "L", ";", //20
"'", "`", "Shift", "\\", "Z", "X", "C", "V", //28
"'", "`", "LShift", "\\", "Z", "X", "C", "V", //28
"B", "N", "M", ",", ".", "/", "RShift", "KP*", //30
"Alt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", //38
"LAlt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", //38
"F6", "F7", "F8", "F9", "F10", "NumLock", "Scroll", "KP7", //40
"KP8", "KP9", "KP-", "KP4", "KP5", "KP6", "KP+", "KP1", //48
"KP2", "KP3", "KP0", "KP.", nullptr, nullptr, "OEM102", "F11", //50

19
source/common/gamecontrol.cpp
View file

@ -120,24 +120,10 @@ static FString GF_NumToName[NUMGAMEFUNCTIONS]; // This one will preserve the ori
static FString GF_NumToAlias[NUMGAMEFUNCTIONS]; // This is for CON scripts to hack apart.
uint8_t KeyboardKeys[NUMGAMEFUNCTIONS][2];
static FString stringStore[2 * NUMGAMEFUNCTIONS]; // toss all persistent strings from the OSDCMDs in here so that they stick around until shutdown.
CVAR(Int, cl_defaultconfiguration, 2, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
static int osdcmd_button(osdcmdptr_t parm)
{
static char const s_gamefunc_[] = "gamefunc_";
int constexpr strlen_gamefunc_ = ARRAY_SIZE(s_gamefunc_) - 1;
char const* p = parm->name + strlen_gamefunc_;
//if (gInputMode == kInputGame) // only trigger these if in game (fixme: Ensure it works for all games!)
CONTROL_ButtonFlags[CONFIG_FunctionNameToNum(p)] = 1; // FIXME
return OSDCMD_OK;
}
//==========================================================================
//
//
@ -454,11 +440,6 @@ int CONFIG_Init()
GF_NameToNum.Insert(gf.name, gf.index);
GF_NumToAlias[gf.index] = GF_NumToName[gf.index] = gf.name;
stringStore[index].Format("gamefunc_%s", gf.name);
stringStore[index].ToLower();
stringStore[index + 1] = stringStore[index];
stringStore[index + 1] += ": game button";
OSD_RegisterFunction(stringStore[index], stringStore[index + 1], osdcmd_button);
index += 2;
}

4
source/common/inputstate.h
View file

@ -199,7 +199,7 @@ public:
void ClearButton(int x)
{
ButtonState[x].ButtonActive = false;
ButtonState[x].ButtonCleared = true;
//ButtonState[x].ButtonCleared = true;
}
void ClearAllButtons()
@ -207,7 +207,7 @@ public:
for (auto & b : ButtonState)
{
b.ButtonActive = false;
b.ButtonCleared = true;
//b.ButtonCleared = true;
}
}

4
source/common/utility/m_argv.cpp
View file

@ -141,9 +141,9 @@ void FArgs::FlushArgs()
int stricmp(const char** check, const char* str)
{
for (auto c = *check; c; c++)
for (int i = 0; check[i]; i++)
{
if (!stricmp(c, str)) return 0;
if (!stricmp(check[i], str)) return 0;
}
return 1; // we do not care about order here.
}

5
source/mact/src/control.cpp
View file

@ -591,11 +591,6 @@ static void CONTROL_GetFunctionInput(void)
CONTROL_ButtonFunctionState(CONTROL_ButtonFlags);
CONTROL_AxisFunctionState(CONTROL_ButtonFlags);
for (int i = 0; i < NUMGAMEFUNCTIONS; i++ )
{
inputState.UpdateButton(i, CONTROL_ButtonFlags[i]);
}
memset(CONTROL_ButtonFlags, 0, sizeof(CONTROL_ButtonFlags));
}

4
wadsrc/static/filter/blood/demolition/defbinds.txt
View file

@ -4,7 +4,7 @@ S "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
Backspace "+Turn_Around"
LAlt "+Strafe"
@ -69,7 +69,7 @@ M "+MedKit"
P "+ProximityBombs"
R "+RemoteBombs"
` "+Show_Console"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Alt_Fire"
MWheelUp "+Previous_Weapon"
MWheelDown "+Next_Weapon"

4
wadsrc/static/filter/blood/demolition/leftbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
Backspace "+Turn_Around"
LAlt "+Strafe"
@ -65,7 +65,7 @@ M "+MedKit"
P "+ProximityBombs"
R "+RemoteBombs"
` "+Show_Console"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Open"
Mouse3 "+Run"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/blood/demolition/origbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
Backspace "+Turn_Around"
LAlt "+Strafe"
@ -70,7 +70,7 @@ M "+MedKit"
P "+ProximityBombs"
R "+RemoteBombs"
` "+Show_Console"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Alt_Fire"
MWheelUp "+Previous_Weapon"
MWheelDown "+Next_Weapon"

4
wadsrc/static/filter/duke/demolition/defbinds.txt
View file

@ -4,7 +4,7 @@ S "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -70,7 +70,7 @@ F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
C "+Toggle_Crouch"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/duke/demolition/leftbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -64,7 +64,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Open"
Mouse3 "+Run"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/duke/demolition/origbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -71,7 +71,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/ionfury/demolition/defbinds.txt
View file

@ -4,7 +4,7 @@ S "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -64,7 +64,7 @@ F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
C "+Toggle_Crouch"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/ionfury/demolition/leftbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -62,7 +62,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Open"
Mouse3 "+Run"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/ionfury/demolition/origbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -65,7 +65,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/nam/demolition/defbinds.txt
View file

@ -4,7 +4,7 @@ S "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -70,7 +70,7 @@ F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
C "+Toggle_Crouch"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/nam/demolition/leftbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -68,7 +68,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Open"
Mouse3 "+Run"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/nam/demolition/origbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -71,7 +71,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/redneck/demolition/defbinds.txt
View file

@ -4,7 +4,7 @@ S "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -70,7 +70,7 @@ X "+Last_Used_Weapon"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/redneck/demolition/leftbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -67,7 +67,7 @@ Q "+Quick_Kick"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Open"
Mouse3 "+Run"
MWheelUp "+Previous_Weapon"

2
wadsrc/static/filter/redneck/demolition/origbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"

2
wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt
View file

@ -37,7 +37,7 @@ K "+See_Coop_View"
U "+Mouse_Aiming"
I "+Toggle_Crosshair"
` "+Show_Console"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+MediKit"
MWheelUp "+Previous_Weapon"
MWheelDown "+Next_Weapon"

4
wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -59,7 +59,7 @@ I "+Toggle_Crosshair"
' "+Next_Weapon"
; "+Previous_Weapon"
` "+Show_Console"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Open"
Mouse3 "+Run"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -64,7 +64,7 @@ I "+Toggle_Crosshair"
' "+Next_Weapon"
; "+Previous_Weapon"
` "+Show_Console"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+MediKit"
MWheelUp "+Previous_Weapon"
MWheelDown "+Next_Weapon"

4
wadsrc/static/filter/ww2gi/demolition/defbinds.txt
View file

@ -4,7 +4,7 @@ S "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -70,7 +70,7 @@ F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
C "+Toggle_Crouch"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/ww2gi/demolition/leftbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -69,7 +69,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Open"
Mouse3 "+Run"
MWheelUp "+Previous_Weapon"

4
wadsrc/static/filter/ww2gi/demolition/origbinds.txt
View file

@ -4,7 +4,7 @@ downarrow "+Move_Backward"
KP2 "+Move_Backward"
leftarrow "+Turn_Left"
KP4 "+Turn_Left"
leftarrow "+Turn_Right"
rightarrow "+Turn_Right"
KP6 "+Turn_Right"
LAlt "+Strafe"
RAlt "+Strafe"
@ -72,7 +72,7 @@ Capslock "+AutoRun"
F6 "+Quick_Save"
F9 "+Quick_Load"
F7 "+Third_Person_View"
Mouse1 "+Weapon_Fire"
Mouse1 "+Fire"
Mouse2 "+Jetpack"
Mouse3 "+MediKit"
MWheelUp "+Previous_Weapon"