OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "Gamepad Improvements"

Browse source 
This reverts commit 2a5cce543b.
This commit is contained in:
Marcus Minhorst 2025-07-06 19:06:59 -04:00 • committed by Ricardo Luís Vaz Silva
commit 0f72a671fc
16 changed files with 215 additions and 1613 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/common/menu/joystickmenu.cpp
View file

@ -84,56 +84,6 @@ DEFINE_ACTION_FUNCTION(IJoystickConfig, SetAxisDeadZone)
return 0;
}
DEFINE_ACTION_FUNCTION(IJoystickConfig, GetAxisDigitalThreshold)
{
PARAM_SELF_STRUCT_PROLOGUE(IJoystickConfig);
PARAM_INT(axis);
ACTION_RETURN_FLOAT(self->GetAxisDigitalThreshold(axis));
}
DEFINE_ACTION_FUNCTION(IJoystickConfig, SetAxisDigitalThreshold)
{
PARAM_SELF_STRUCT_PROLOGUE(IJoystickConfig);
PARAM_INT(axis);
PARAM_FLOAT(dt);
self->SetAxisDigitalThreshold(axis, (float)dt);
return 0;
}
DEFINE_ACTION_FUNCTION(IJoystickConfig, GetAxisResponseCurve)
{
PARAM_SELF_STRUCT_PROLOGUE(IJoystickConfig);
PARAM_INT(axis);
ACTION_RETURN_INT(self->GetAxisResponseCurve(axis));
}
DEFINE_ACTION_FUNCTION(IJoystickConfig, SetAxisResponseCurve)
{
PARAM_SELF_STRUCT_PROLOGUE(IJoystickConfig);
PARAM_INT(axis);
PARAM_INT(curve);
self->SetAxisResponseCurve(axis, (EJoyCurve)curve);
return 0;
}
DEFINE_ACTION_FUNCTION(IJoystickConfig, GetAxisResponseCurvePoint)
{
PARAM_SELF_STRUCT_PROLOGUE(IJoystickConfig);
PARAM_INT(axis);
PARAM_INT(point);
ACTION_RETURN_INT(self->GetAxisResponseCurvePoint(axis, point));
}
DEFINE_ACTION_FUNCTION(IJoystickConfig, SetAxisResponseCurvePoint)
{
PARAM_SELF_STRUCT_PROLOGUE(IJoystickConfig);
PARAM_INT(axis);
PARAM_INT(point);
PARAM_FLOAT(value);
self->SetAxisResponseCurvePoint(axis, point, value);
return 0;
}
DEFINE_ACTION_FUNCTION(IJoystickConfig, GetAxisMap)
{
PARAM_SELF_STRUCT_PROLOGUE(IJoystickConfig);

2
src/common/menu/menu.cpp
View file

@ -680,7 +680,7 @@ bool M_Responder (event_t *ev)
else if (menuactive != MENU_WaitKey && (ev->type == EV_KeyDown || ev->type == EV_KeyUp))
{
// eat blocked controller events without dispatching them.
if (ev->data1 >= KEY_FIRSTJOYBUTTON && m_blockcontrollers && ev->type == EV_KeyDown) return true;
if (ev->data1 >= KEY_FIRSTJOYBUTTON && m_blockcontrollers) return true;
keyup = ev->type == EV_KeyUp;