Don't spawn a player immediately when a joystick is connected

A connected joystick will no longer automatically spawn a player until the user presses A.

Author: Semphris

src/control/game_controller_manager.cpp

@@ -48,11 +48,24 @@ GameControllerManager::process_button_event(const SDL_ControllerButtonEvent& ev)
   int player_id;
 
   {
-    auto it = m_game_controllers.find(SDL_GameControllerFromInstanceID(ev.which));
+    auto* controller = SDL_GameControllerFromInstanceID(ev.which);
+    auto it = m_game_controllers.find(controller);
 
-    if (it == m_game_controllers.end() || it->second < 0)
+    if (it == m_game_controllers.end())
       return;
 
+    if (it->second < 0)
+    {
+      if (ev.button == SDL_CONTROLLER_BUTTON_A && g_config->multiplayer_auto_manage_players)
+      {
+        autobind_controller(controller);
+      }
+      else
+      {
+        return;
+      }
+    }
+
     player_id = it->second;
   }
 
@@ -229,25 +242,22 @@ GameControllerManager::on_controller_added(int joystick_index)
 
       if (m_parent->m_use_game_controller && g_config->multiplayer_auto_manage_players)
       {
-        int id = m_parent->get_num_users();
+        // TODO: Display a popup stating that a controller was connected and that the player may joind by pressing A
+
+        // If a player already exists, bind it immediately without waiting for the user to press A.
         for (int i = 0; i < m_parent->get_num_users(); i++)
         {
           if (!m_parent->has_corresponsing_controller(i) && !m_parent->m_uses_keyboard[i])
           {
-            id = i;
+            m_game_controllers[game_controller] = i;
+
+            if (i != 0)
+            {
+              GameSession::current()->on_player_added(i);
+            }
             break;
           }
         }
-
-        if (id == m_parent->get_num_users())
-          m_parent->push_user();
-
-        m_game_controllers[game_controller] = id;
-
-        if (GameSession::current() && (savegame && savegame->is_title_screen()) && id != 0)
-        {
-          GameSession::current()->on_player_added(id);
-        }
       }
     }
   }
@@ -343,3 +353,21 @@ GameControllerManager::bind_controller(SDL_GameController* controller, int playe
       if (pair2.second == player_id && pair2.first != controller)
         pair2.second = -1;
 }
+
+void
+GameControllerManager::autobind_controller(SDL_GameController* game_controller)
+{
+  // This function only binds unbound controllers to a new player; binding to an
+  // existing player or rebinding an already bound controller should be dealt
+  // with elsewhere.
+  assert(m_game_controllers[game_controller] == -1);
+
+  int id = m_parent->get_num_users();
+  m_parent->push_user();
+  m_game_controllers[game_controller] = id;
+
+  if (GameSession::current())
+  {
+    GameSession::current()->on_player_added(id);
+  }
+}

src/control/game_controller_manager.hpp

@@ -55,6 +55,9 @@ class GameControllerManager final
 
   inline std::unordered_map<SDL_GameController*, int>& get_controller_mapping() { return m_game_controllers; }
 
+private:
+  void autobind_controller(SDL_GameController* game_controller);
+
 private:
   InputManager* m_parent;
   int m_deadzone;

src/control/joystick_manager.cpp

@@ -82,24 +82,22 @@ JoystickManager::on_joystick_added(int joystick_index)
 
     if (!parent->m_use_game_controller && g_config->multiplayer_auto_manage_players)
     {
-      int id = parent->get_num_users();
+      // TODO: Display a popup stating that a controller was connected and that the player may joind by pressing A
+
+      // If a player already exists, bind it immediately without waiting for the user to press A.
       for (int i = 0; i < parent->get_num_users(); i++)
       {
         if (!parent->has_corresponsing_controller(i) && !parent->m_uses_keyboard[i])
         {
-          id = i;
-          break;
-        }
-      }
-
-      if (id == parent->get_num_users())
-        parent->push_user();
+          joysticks[joystick] = i;
 
-      joysticks[joystick] = id;
+          if (i != 0)
+          {
+            GameSession::current()->on_player_added(i);
+          }
 
-      if (GameSession::current() && !GameSession::current()->get_savegame().is_title_screen() && id != 0)
-      {
-        GameSession::current()->on_player_added(id);
+          break;
+        }
       }
     }
   }
@@ -257,7 +255,7 @@ JoystickManager::process_button_event(const SDL_JoyButtonEvent& jbutton)
   {
     auto i = m_joystick_config.m_joy_button_map.find(std::make_pair(jbutton.which, jbutton.button));
     if (i == m_joystick_config.m_joy_button_map.end()) {
-      log_debug << "Unmapped joybutton " << static_cast<int>(jbutton.button) << " pressed" << std::endl;
+      log_fatal << "Unmapped joybutton " << static_cast<int>(jbutton.button) << " pressed" << std::endl;
     } else {
       set_joy_controls(jbutton.which, i->second, (jbutton.state == SDL_PRESSED));
     }
@@ -274,9 +272,21 @@ void
 JoystickManager::set_joy_controls(SDL_JoystickID joystick, Control id, bool value)
 {
   auto it = joysticks.find(SDL_JoystickFromInstanceID(joystick));
-  if (it == joysticks.end() || it->second < 0)
+  if (it == joysticks.end())
     return;
 
+  if (it->second < 0)
+  {
+    if (id == Control::JUMP && g_config->multiplayer_auto_manage_players)
+    {
+      autobind_joystick(it->first);
+    }
+    else
+    {
+      return;
+    }
+  }
+
   if (m_joystick_config.m_jump_with_up_joy &&
       id == Control::UP)
   {
@@ -346,3 +356,21 @@ JoystickManager::bind_joystick(SDL_Joystick* controller, int player_id)
       if (pair2.second == player_id && pair2.first != controller)
         pair2.second = -1;
 }
+
+void
+JoystickManager::autobind_joystick(SDL_Joystick* joystick)
+{
+  // This function only binds unbound joysticks to a new player; binding to an
+  // existing player or rebinding an already bound joystick should be dealt with
+  // elsewhere.
+  assert(joysticks[joystick] == -1);
+
+  int id = parent->get_num_users();
+  parent->push_user();
+  joysticks[joystick] = id;
+
+  if (GameSession::current())
+  {
+    GameSession::current()->on_player_added(id);
+  }
+}

src/control/joystick_manager.hpp

@@ -63,6 +63,9 @@ class JoystickManager final
 
   inline std::unordered_map<SDL_Joystick*, int>& get_joystick_mapping() { return joysticks; }
 
+private:
+  void autobind_joystick(SDL_Joystick* joystick);
+
 private:
   InputManager* parent;
   JoystickConfig& m_joystick_config;