Moved some code to JoystickManager

Author: Semphris

src/control/input_manager.cpp

@@ -154,11 +154,7 @@ InputManager::pop_user()
 void
 InputManager::on_player_removed(int player_id)
 {
-  auto& map = joystick_manager->get_joystick_mapping();
-  auto it = std::find_if(map.begin(), map.end(), [player_id](std::remove_reference<decltype(map)>::type::const_reference pair) { return pair.second == player_id; });
-  if (it != map.end())
-    it->second = -1;
-
+  joystick_manager->on_player_removed(player_id);
   game_controller_manager->on_player_removed(player_id);
 }
 
@@ -171,10 +167,7 @@ InputManager::has_corresponsing_controller(int player_id) const
   }
   else
   {
-    auto& map = joystick_manager->get_joystick_mapping();
-    return std::find_if(map.begin(), map.end(), [player_id](std::remove_reference<decltype(map)>::type::const_reference pair) {
-      return pair.second == player_id;
-    }) != map.end();
+    return joystick_manager->has_corresponding_joystick(player_id);
   }
 }
 

src/control/joystick_manager.cpp

@@ -303,4 +303,66 @@ JoystickManager::set_joy_controls(SDL_JoystickID joystick, Control id, bool valu
   parent->get_controller(it->second).set_control(id, value);
 }
 
+void
+JoystickManager::on_player_removed(int player_id)
+{
+  auto it2 = std::find_if(joysticks.begin(), joysticks.end(), [player_id](decltype(joysticks)::const_reference pair) {
+    return pair.second == player_id;
+  });
+  if (it2 != joysticks.end())
+  {
+    it2->second = -1;
+    // Try again, in case multiple controllers were bount to a player
+    // Recursive call shouldn't go too deep except in hardcore scenarios
+    on_player_removed(player_id);
+  }
+}
+
+bool
+JoystickManager::has_corresponding_joystick(int player_id) const
+{
+  return std::find_if(joysticks.begin(), joysticks.end(), [player_id](decltype(joysticks)::const_reference pair) {
+    return pair.second == player_id;
+  }) != joysticks.end();
+}
+
+int
+JoystickManager::rumble(SDL_Joystick* controller) const
+{
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+  if (g_config->multiplayer_buzz_controllers)
+  {
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+    if (SDL_JoystickHasRumble(controller))
+    {
+#endif
+      // TODO: Rumble intensity setting (like volume)
+      SDL_JoystickRumble(controller, 0xFFFF, 0xFFFF, 300);
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+    }
+    else
+    {
+      return 1;
+    }
+#endif
+  }
+
+  return 0;
+#else
+  return 2;
+#endif
+}
+
+void
+JoystickManager::bind_joystick(SDL_Joystick* controller, int player_id)
+{
+  joysticks[controller] = player_id;
+
+  if (!g_config->multiplayer_multibind)
+    for (auto& pair2 : joysticks)
+      if (pair2.second == player_id && pair2.first != controller)
+        pair2.second = -1;
+}
+
+
 /* EOF */

src/control/joystick_manager.hpp

@@ -54,6 +54,14 @@ class JoystickManager final
 
   int get_num_joysticks() const { return static_cast<int>(joysticks.size()); }
 
+  void on_player_removed(int player_id);
+  bool has_corresponding_joystick(int player_id) const;
+
+  /** @returns 0 if success, 1 if controller doesn't support rumbling, 2 if game doesn't support rumbling */
+  int rumble(SDL_Joystick* joystick) const;
+
+  void bind_joystick(SDL_Joystick* joystick, int player_id);
+
   std::unordered_map<SDL_Joystick*, int>& get_joystick_mapping() { return joysticks; }
 
 private:

src/supertux/menu/multiplayer_player_menu.cpp

@@ -175,38 +175,27 @@ MultiplayerPlayerMenu::MultiplayerPlayerMenu(int player_id)
       std::string prefix = (pair.second == -1) ? "" : (pair.second == player_id) ? "-> " : ("[" + std::to_string(pair.second + 1) + "] ");
 
       add_entry(prefix + std::string(SDL_JoystickName(pair.first)), [joystick, player_id] {
-        InputManager::current()->joystick_manager->get_joystick_mapping()[joystick] = player_id;
+        InputManager::current()->joystick_manager->bind_joystick(joystick, player_id);
 
-        if (!g_config->multiplayer_multibind)
-          for (auto& pair2 : InputManager::current()->joystick_manager->get_joystick_mapping())
-            if (pair2.second == player_id && pair2.first != joystick)
-              pair2.second = -1;
+        auto err = InputManager::current()->joystick_manager->rumble(joystick);
+        switch (err)
+        {
+          case 1:
+            Dialog::show_message(_("This joystick does not support rumbling;"
+                                   "\nplease check the joysticks manually."));
+            break;
 
-        MenuManager::instance().set_menu(std::make_unique<MultiplayerPlayerMenu>(player_id));
+          case 2:
+            Dialog::show_message(_("This SuperTux build does not support "
+                                   "rumbling\njoysticks; please check the "
+                                   "joysticks manually."));
+            break;
 
-#if SDL_VERSION_ATLEAST(2, 0, 9)
-        if (g_config->multiplayer_buzz_controllers)
-        {
-#if SDL_VERSION_ATLEAST(2, 0, 18)
-          if (SDL_JoystickHasRumbleTriggers(joystick))
-          {
-#endif
-            // TODO: Rumble intensity setting (like volume)
-            SDL_JoystickRumble(joystick, 0xFFFF, 0xFFFF, 300);
-#if SDL_VERSION_ATLEAST(2, 0, 18)
-          }
-          else
-          {
-            Dialog::show_message(_("This joystick does not support rumbling;\n"
-                                    "please check the joysticks manually."));
-          }
-#endif
+          default:
+            break;
         }
-#else
-        Dialog::show_message(_("This SuperTux build does not support rumbling\n"
-                                "joysticks; please check the joysticks manually.\n"
-                                "\nYou may disable this message in the Options menu."));
-#endif
+
+        MenuManager::instance().set_menu(std::make_unique<MultiplayerPlayerMenu>(player_id));
       });
     }
   }