Fixed right and center (wheel) mouse buttons chaos

Sometimes right was recognized as center buttor and vice versa
OpenXRay · Jul 24, 2018 · ede90c5 · ede90c5
1 parent 96a90c4
commit ede90c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/xrGame/Level_input.cpp b/src/xrGame/Level_input.cpp
@@ -71,11 +71,9 @@ void CLevel::IR_OnMouseWheel(int x, int y)
     }
 }
 
-static int mouse_button_2_key[] = {SDL_NUM_SCANCODES, MOUSE_1, MOUSE_2, MOUSE_3};
-
-void CLevel::IR_OnMousePress(int btn) {IR_OnKeyboardPress(mouse_button_2_key[btn]); }
-void CLevel::IR_OnMouseRelease(int btn) {IR_OnKeyboardRelease(mouse_button_2_key[btn]); }
-void CLevel::IR_OnMouseHold(int btn) {IR_OnKeyboardHold(mouse_button_2_key[btn]); }
+void CLevel::IR_OnMousePress(int btn) {IR_OnKeyboardPress(MouseButtonToKey[btn]); }
+void CLevel::IR_OnMouseRelease(int btn) {IR_OnKeyboardRelease(MouseButtonToKey[btn]); }
+void CLevel::IR_OnMouseHold(int btn) {IR_OnKeyboardHold(MouseButtonToKey[btn]); }
 void CLevel::IR_OnMouseMove(int dx, int dy)
 {
     if (g_bDisableAllInput)

diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -300,29 +300,28 @@ bool CMainMenu::IsActive() { return !!m_Flags.test(flActive); }
 bool CMainMenu::CanSkipSceneRendering() { return IsActive() && !m_Flags.test(flGameSaveScreenshot); }
 
 // IInputReceiver
-static int mouse_button_2_key[] = { MOUSE_1, MOUSE_2, MOUSE_3, MOUSE_4, MOUSE_5, MOUSE_6, MOUSE_7, MOUSE_8 };
 void CMainMenu::IR_OnMousePress(int btn)
 {
     if (!IsActive())
         return;
 
-    IR_OnKeyboardPress(mouse_button_2_key[btn]);
+    IR_OnKeyboardPress(MouseButtonToKey[btn]);
 };
 
 void CMainMenu::IR_OnMouseRelease(int btn)
 {
     if (!IsActive())
         return;
 
-    IR_OnKeyboardRelease(mouse_button_2_key[btn]);
+    IR_OnKeyboardRelease(MouseButtonToKey[btn]);
 };
 
 void CMainMenu::IR_OnMouseHold(int btn)
 {
     if (!IsActive())
         return;
 
-    IR_OnKeyboardHold(mouse_button_2_key[btn]);
+    IR_OnKeyboardHold(MouseButtonToKey[btn]);
 };
 
 void CMainMenu::IR_OnMouseMove(int x, int y)

diff --git a/src/xrGame/UIDialogHolder.cpp b/src/xrGame/UIDialogHolder.cpp
@@ -251,7 +251,7 @@ bool CDialogHolder::IR_UIOnKeyboardPress(SDL_Scancode dik)
     {
         Fvector2 cp = GetUICursor().GetCursorPosition();
         EUIMessages action =
-            (dik == MOUSE_1) ? WINDOW_LBUTTON_DOWN : (dik == MOUSE_2) ? WINDOW_CBUTTON_DOWN : WINDOW_RBUTTON_DOWN;
+            (dik == MOUSE_1) ? WINDOW_LBUTTON_DOWN : (dik == MOUSE_2) ? WINDOW_RBUTTON_DOWN : WINDOW_CBUTTON_DOWN;
         if (TIR->OnMouseAction(cp.x, cp.y, action))
             return true;
     }

diff --git a/src/xrGame/xr_level_controller.h b/src/xrGame/xr_level_controller.h
@@ -172,3 +172,5 @@ extern ConsoleBindCmds bindConsoleCmds;
 #define MOUSE_6 (SDL_NUM_SCANCODES + 6)
 #define MOUSE_7 (SDL_NUM_SCANCODES + 7)
 #define MOUSE_8 (SDL_NUM_SCANCODES + 8)
+
+constexpr int MouseButtonToKey[] = { MOUSE_1, MOUSE_3, MOUSE_2, MOUSE_4, MOUSE_5, MOUSE_6, MOUSE_7, MOUSE_8 };