From c9cd7cb4efb1cf390e0041c8b503afe868deec55 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Thu, 17 Dec 2020 17:39:28 +0100 Subject: [PATCH] fixed global hotkey logic and warning --- src/emucore/EventHandler.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 98d09d261..8bc0c0489 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -453,8 +453,6 @@ AdjustFunction EventHandler::cycleAdjustSetting(int direction) case AdjustGroup::INPUT: { const bool grabMouseAllowed = myOSystem.frameBuffer().grabMouseAllowed(); - const bool analog = myOSystem.console().leftController().isAnalog() - || myOSystem.console().rightController().isAnalog(); const bool joystick = isJoystick(myOSystem.console().leftController()) || isJoystick(myOSystem.console().rightController()); const bool paddle = isPaddle(myOSystem.console().leftController()) @@ -472,7 +470,7 @@ AdjustFunction EventHandler::cycleAdjustSetting(int direction) repeat = (!grabMouseAllowed && myAdjustSetting == AdjustSetting::GRAB_MOUSE) || (!joystick && (myAdjustSetting == AdjustSetting::DEADZONE - || myAdjustSetting == AdjustSetting::FOUR_DIRECTIONS) + || myAdjustSetting == AdjustSetting::FOUR_DIRECTIONS)) || (!paddle && (myAdjustSetting == AdjustSetting::ANALOG_SENSITIVITY || myAdjustSetting == AdjustSetting::DEJITTER_AVERAGING @@ -490,8 +488,7 @@ AdjustFunction EventHandler::cycleAdjustSetting(int direction) || ((!hasMouseControl() || !useMouse) && myAdjustSetting == AdjustSetting::MOUSE_CONTROL) || ((!paddle || !useMouse) - && myAdjustSetting == AdjustSetting::MOUSE_RANGE) - ); + && myAdjustSetting == AdjustSetting::MOUSE_RANGE); break; }