Moved some code to GameControllerManager

Author: Semphris

src/control/game_controller_manager.cpp

@@ -301,4 +301,65 @@ GameControllerManager::on_controller_removed(int instance_id)
   }
 }
 
+void
+GameControllerManager::on_player_removed(int player_id)
+{
+  auto it2 = std::find_if(m_game_controllers.begin(), m_game_controllers.end(), [player_id](decltype(m_game_controllers)::const_reference pair) {
+    return pair.second == player_id;
+  });
+  if (it2 != m_game_controllers.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
+GameControllerManager::has_corresponding_game_controller(int player_id) const
+{
+  return std::find_if(m_game_controllers.begin(), m_game_controllers.end(), [player_id](decltype(m_game_controllers)::const_reference pair) {
+    return pair.second == player_id;
+  }) != m_game_controllers.end();
+}
+
+int
+GameControllerManager::rumble(SDL_GameController* controller) const
+{
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+  if (g_config->multiplayer_buzz_controllers)
+  {
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+    if (SDL_GameControllerHasRumble(controller))
+    {
+#endif
+      // TODO: Rumble intensity setting (like volume)
+      SDL_GameControllerRumble(controller, 0xFFFF, 0xFFFF, 300);
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+    }
+    else
+    {
+      return 1;
+    }
+#endif
+  }
+
+  return 0;
+#else
+  return 2;
+#endif
+}
+
+void
+GameControllerManager::bind_controller(SDL_GameController* controller, int player_id)
+{
+  m_game_controllers[controller] = player_id;
+
+  if (!g_config->multiplayer_multibind)
+    for (auto& pair2 : m_game_controllers)
+      if (pair2.second == player_id && pair2.first != controller)
+        pair2.second = -1;
+}
+
 /* EOF */

src/control/game_controller_manager.hpp

@@ -46,6 +46,14 @@ class GameControllerManager final
   void on_controller_added(int joystick_index);
   void on_controller_removed(int instance_id);
 
+  void on_player_removed(int player_id);
+  bool has_corresponding_game_controller(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_GameController* controller) const;
+
+  void bind_controller(SDL_GameController* controller, int player_id);
+
   std::unordered_map<SDL_GameController*, int>& get_controller_mapping() { return m_game_controllers; }
 
 private:

src/control/input_manager.cpp

@@ -159,26 +159,15 @@ InputManager::on_player_removed(int player_id)
   if (it != map.end())
     it->second = -1;
 
-  auto& map2 = game_controller_manager->get_controller_mapping();
-  auto it2 = std::find_if(map2.begin(), map2.end(), [player_id](std::remove_reference<decltype(map2)>::type::const_reference pair) { return pair.second == player_id; });
-  if (it2 != map2.end())
-    it2->second = -1;
+  game_controller_manager->on_player_removed(player_id);
 }
 
 bool
 InputManager::has_corresponsing_controller(int player_id) const
 {
-/*
-  // Player 0 should always be considered to have a controller
-  if (!player_id)
-    return true;
-*/
   if (m_use_game_controller)
   {
-    auto& map = game_controller_manager->get_controller_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 game_controller_manager->has_corresponding_game_controller(player_id);
   }
   else
   {

src/supertux/menu/multiplayer_player_menu.cpp

@@ -143,38 +143,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_GameControllerName(pair.first)), [controller, player_id] {
-        InputManager::current()->game_controller_manager->get_controller_mapping()[controller] = player_id;
+        InputManager::current()->game_controller_manager->bind_controller(controller, player_id);
 
-        if (!g_config->multiplayer_multibind)
-          for (auto& pair2 : InputManager::current()->game_controller_manager->get_controller_mapping())
-            if (pair2.second == player_id && pair2.first != controller)
-              pair2.second = -1;
-
-        MenuManager::instance().set_menu(std::make_unique<MultiplayerPlayerMenu>(player_id));
-
-#if SDL_VERSION_ATLEAST(2, 0, 9)
-        if (g_config->multiplayer_buzz_controllers)
+        auto err = InputManager::current()->game_controller_manager->rumble(controller);
+        switch (err)
         {
-#if SDL_VERSION_ATLEAST(2, 0, 18)
-          if (SDL_GameControllerHasRumble(controller))
-          {
-#endif
-            // TODO: Rumble intensity setting (like volume)
-            SDL_GameControllerRumble(controller, 0xFFFF, 0xFFFF, 300);
-#if SDL_VERSION_ATLEAST(2, 0, 18)
-          }
-          else
-          {
-            Dialog::show_message(_("This controller does not support rumbling;\n"
-                                    "please check the controllers manually."));
-          }
-#endif
+          case 1:
+            Dialog::show_message(_("This controller does not support rumbling;"
+                                   "\nplease check the controllers manually."));
+            break;
+
+          case 2:
+            Dialog::show_message(_("This SuperTux build does not support "
+                                   "rumbling\ncontrollers; please check the "
+                                   "controllers manually."));
+            break;
+
+          default:
+            break;
         }
-#else
-        Dialog::show_message(_("This SuperTux build does not support rumbling\n"
-                                "controllers; please check the controllers manually.\n"
-                                "\nYou may disable this message in the Options menu."));
-#endif
+
+        MenuManager::instance().set_menu(std::make_unique<MultiplayerPlayerMenu>(player_id));
       });
     }
   }