ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed one global hot key adjustment

This commit is contained in:
Thomas Jentzsch 2021-10-30 09:55:23 +02:00
parent 913e96942f
commit d7f4bdd9f3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emucore/EventHandler.cxx
View File

@ -967,7 +967,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
if(pressed) if(pressed)
{ {
myPJoyHandler->changeDigitalDeadZone(-1); myPJoyHandler->changeDigitalDeadZone(-1);
myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DEADZONE); myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DIGITAL_DEADZONE);
} }
return; return;
@ -975,7 +975,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
if(pressed) if(pressed)
{ {
myPJoyHandler->changeDigitalDeadZone(+1); myPJoyHandler->changeDigitalDeadZone(+1);
myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DEADZONE); myGlobalKeyHandler->setSetting(GlobalKeyHandler::Setting::DIGITAL_DEADZONE);
} }
return; return;

4
src/emucore/GlobalKeyHandler.cxx
View File

@ -236,7 +236,7 @@ bool GlobalKeyHandler::skipInputSetting() const
return (!grabMouseAllowed && mySetting == Setting::GRAB_MOUSE) return (!grabMouseAllowed && mySetting == Setting::GRAB_MOUSE)
|| (!joystick || (!joystick
&& (mySetting == Setting::DEADZONE && (mySetting == Setting::DIGITAL_DEADZONE
|| mySetting == Setting::FOUR_DIRECTIONS)) || mySetting == Setting::FOUR_DIRECTIONS))
|| (!paddle || (!paddle
&& (mySetting == Setting::ANALOG_DEADZONE && (mySetting == Setting::ANALOG_DEADZONE
@ -377,7 +377,7 @@ GlobalKeyHandler::SettingData GlobalKeyHandler::getSettingData(const Setting set
{Setting::SCANLINES, {true, std::bind(&TIASurface::setScanlineIntensity, &myOSystem.frameBuffer().tiaSurface(), _1)}}, {Setting::SCANLINES, {true, std::bind(&TIASurface::setScanlineIntensity, &myOSystem.frameBuffer().tiaSurface(), _1)}},
{Setting::INTERPOLATION, {false, std::bind(&Console::toggleInter, &myOSystem.console(), _1)}}, {Setting::INTERPOLATION, {false, std::bind(&Console::toggleInter, &myOSystem.console(), _1)}},
// *** Input group *** // *** Input group ***
{Setting::DEADZONE, {true, std::bind(&PhysicalJoystickHandler::changeDigitalDeadZone, &joyHandler(), _1)}}, {Setting::DIGITAL_DEADZONE, {true, std::bind(&PhysicalJoystickHandler::changeDigitalDeadZone, &joyHandler(), _1)}},
{Setting::ANALOG_DEADZONE, {true, std::bind(&PhysicalJoystickHandler::changeAnalogPaddleDeadZone, &joyHandler(), _1)}}, {Setting::ANALOG_DEADZONE, {true, std::bind(&PhysicalJoystickHandler::changeAnalogPaddleDeadZone, &joyHandler(), _1)}},
{Setting::ANALOG_SENSITIVITY, {true, std::bind(&PhysicalJoystickHandler::changeAnalogPaddleSensitivity, &joyHandler(), _1)}}, {Setting::ANALOG_SENSITIVITY, {true, std::bind(&PhysicalJoystickHandler::changeAnalogPaddleSensitivity, &joyHandler(), _1)}},
{Setting::ANALOG_LINEARITY, {true, std::bind(&PhysicalJoystickHandler::changeAnalogPaddleLinearity, &joyHandler(), _1)}}, {Setting::ANALOG_LINEARITY, {true, std::bind(&PhysicalJoystickHandler::changeAnalogPaddleLinearity, &joyHandler(), _1)}},

4
src/emucore/GlobalKeyHandler.hxx
View File

@ -72,7 +72,7 @@ class GlobalKeyHandler
SCANLINES, SCANLINES,
INTERPOLATION, INTERPOLATION,
// *** Input group *** // *** Input group ***
DEADZONE, DIGITAL_DEADZONE,
ANALOG_DEADZONE, ANALOG_DEADZONE,
ANALOG_SENSITIVITY, ANALOG_SENSITIVITY,
ANALOG_LINEARITY, ANALOG_LINEARITY,
@ -125,7 +125,7 @@ class GlobalKeyHandler
NUM_ADJ, NUM_ADJ,
START_AV_ADJ = VOLUME, START_AV_ADJ = VOLUME,
END_AV_ADJ = INTERPOLATION, END_AV_ADJ = INTERPOLATION,
START_INPUT_ADJ = DEADZONE, START_INPUT_ADJ = DIGITAL_DEADZONE,
END_INPUT_ADJ = MOUSE_RANGE, END_INPUT_ADJ = MOUSE_RANGE,
START_DEBUG_ADJ = STATS, START_DEBUG_ADJ = STATS,
END_DEBUG_ADJ = JITTER, END_DEBUG_ADJ = JITTER,