Don't process mouse inputs if there are joystick inputs

Aleph-One-Marathon · Oct 11, 2024 · 27f9ed4 · 27f9ed4
1 parent 5b2958e
commit 27f9ed4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Source_Files/Misc/vbl.cpp b/Source_Files/Misc/vbl.cpp
@@ -1206,12 +1206,13 @@ uint32 parse_keymap(void)
 		  hotkey_sequence[2] = 0;
 	  }
 
+	  auto before_processing_flags = flags;
 	  flags = process_joystick_axes(flags);
 
-      // Handle the selected input controller
-      if (input_preferences->input_device == _mouse_yaw_pitch) {
-          flags = process_aim_input(flags, pull_mouselook_delta());
-      }
+	  // Handle the selected input controller
+	  if (before_processing_flags == flags && input_preferences->input_device == _mouse_yaw_pitch) {
+		  flags = process_aim_input(flags, pull_mouselook_delta());
+	  }
 
       // if the user prefers to toggle run/swim, the flag becomes latched
       if (input_preferences->modifiers & _inputmod_run_key_toggle)