Added helper functions to determine input type (gamepad or keyboard &…

… mouse) Reduces code length
OpenXRay · Aug 10, 2023 · 9566601 · 9566601
1 parent 07fbd10
commit 9566601
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/xrEngine/xr_input.h b/src/xrEngine/xr_input.h
@@ -159,7 +159,10 @@ class ENGINE_API CInput
     bool IsControllerAvailable() const { return !controllers.empty(); }
     void EnableControllerSensors(bool enable);
 
-    auto GetCurrentInputType() { return currentInputType; }
+    auto GetCurrentInputType() const { return currentInputType; }
+    auto IsCurrentInputTypeController() const { return GetCurrentInputType() == InputType::Controller; }
+    auto IsCurrentInputTypeKeyboardMouse() const { return GetCurrentInputType() == InputType::KeyboardMouse; }
+
 public:
     void ExclusiveMode(const bool exclusive);
     bool IsExclusiveMode() const;

diff --git a/src/xrGame/UIDialogHolder.cpp b/src/xrGame/UIDialogHolder.cpp
@@ -225,7 +225,7 @@ void CDialogHolder::OnFrame()
 {
     m_b_in_update = true;
 
-    if (GetUICursor().IsVisible() && pInput->GetCurrentInputType() == CInput::Controller)
+    if (GetUICursor().IsVisible() && pInput->IsCurrentInputTypeController())
         GetUICursor().UpdateAutohideTiming();
 
     CUIDialogWnd* wnd = TopInputReceiver();