Removed Ctrl, Alt, and Shift generalization.

OutpostUniverse · Apr 16, 2024 · 0fbebef · 0fbebef
1 parent aaffd82
commit 0fbebef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/OPHD/Command/KeyboardInputHandler.cpp b/OPHD/Command/KeyboardInputHandler.cpp
@@ -8,11 +8,8 @@
 
 void KeyboardInputHandler::handleInput(NAS2D::EventHandler::KeyModifier keyModifiers, NAS2D::EventHandler::KeyCode keyCode)
 {
-	auto keyModifiersFiltered = NAS2D::EventHandler::KeyModifier::None;
-
-	NAS2D::Utility<NAS2D::EventHandler>::get().shift(keyModifiers) ? keyModifiersFiltered |= NAS2D::EventHandler::KeyModifier::Shift : keyModifiersFiltered;
-	NAS2D::Utility<NAS2D::EventHandler>::get().control(keyModifiers) ? keyModifiersFiltered |= NAS2D::EventHandler::KeyModifier::Ctrl : keyModifiersFiltered;
-	NAS2D::Utility<NAS2D::EventHandler>::get().alt(keyModifiers) ? keyModifiersFiltered |= NAS2D::EventHandler::KeyModifier::Alt : keyModifiersFiltered;
+	auto keyModifiersMask = NAS2D::EventHandler::KeyModifier::Ctrl | NAS2D::EventHandler::KeyModifier::Shift | NAS2D::EventHandler::KeyModifier::Alt;
+	auto keyModifiersFiltered = keyModifiers & keyModifiersMask;
 
 	mMoveCommandScalar = 1;
 

diff --git a/OPHD/States/MapViewState.cpp b/OPHD/States/MapViewState.cpp
@@ -1363,10 +1363,10 @@ void MapViewState::registerCommandsDefaultBindings()
 	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyCode::KEY_d, &mMoveNorthEastCommand);
 	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyCode::KEY_RIGHT, &mMoveNorthEastCommand);
 	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyCode::KEY_F1, &mReportsUiCommand);
-	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::Ctrl | NAS2D::EventHandler::KeyModifier::Shift, NAS2D::EventHandler::KeyCode::KEY_F10, &mShowCheatMenuCommand);
-	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::Shift, &mShiftModifierCommand);
-	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::Ctrl, &mCtrlModifierCommand);
-	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::Ctrl | NAS2D::EventHandler::KeyModifier::Shift, &mCtrlShiftModifierCommand);
+	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::CtrlLeft | NAS2D::EventHandler::KeyModifier::ShiftLeft, NAS2D::EventHandler::KeyCode::KEY_F10, &mShowCheatMenuCommand);
+	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::ShiftLeft, &mShiftModifierCommand);
+	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::CtrlLeft, &mCtrlModifierCommand);
+	mKeyboardInputHandler.registerCommand(NAS2D::EventHandler::KeyModifier::CtrlRight | NAS2D::EventHandler::KeyModifier::ShiftRight, &mCtrlShiftModifierCommand);
 }
 
 /**