Merge pull request #2043 from Semphriss/multiplayer

Multiplayer

Author: Semphriss

data/images/engine/hud/arrowdown.png

@@ -2691,7 +2691,7 @@
       (height 288)
       (script "Level.spawn(\"forest\",\"main\");")
       (button #f)
-      (x 9024)
+      (x 9056)
       (y 672)
     )
     (secretarea
@@ -4275,7 +4275,7 @@
     )
     (spawnpoint
       (name "main")
-      (x 32)
+      (x 96)
       (y 800)
     )
     (tilemap

data/levels/community2016/Under_The_Water (davide).stl

@@ -103,6 +103,8 @@ Haywire::collision_squished(GameObject& object)
 void
 Haywire::active_update(float dt_sec)
 {
+  auto* player = get_nearest_player();
+
   if (is_exploding) {
     ticking->set_position(get_pos());
     grunting->set_position(get_pos());
@@ -126,7 +128,7 @@ Haywire::active_update(float dt_sec)
 
   if (is_exploding)
   {
-    if (on_ground() && std::abs(m_physic.get_velocity_x()) > 40.f && !Sector::get().get_player().is_dying())
+    if (on_ground() && std::abs(m_physic.get_velocity_x()) > 40.f && player)
     {
       //jump over 1-tall roadblocks
       Rectf jump_box = get_bbox();
@@ -153,7 +155,7 @@ Haywire::active_update(float dt_sec)
         gap_box.set_bottom(m_col.m_bbox.get_bottom() + 28.f);
 
         if (Sector::get().is_free_of_statics(gap_box)
-          && (get_nearest_player()->get_bbox().get_bottom() <= m_col.m_bbox.get_bottom()))
+          && (player->get_bbox().get_bottom() <= m_col.m_bbox.get_bottom()))
         {
           m_physic.set_velocity_y(-325.f);
         }
@@ -173,17 +175,16 @@ Haywire::active_update(float dt_sec)
 	      walk_right_action = "active-right";
     }
 
-    auto p = get_nearest_player ();
     float target_velocity = 0.f;
 
     if (stomped_timer.get_timeleft() >= 0.05f)
     {
       target_velocity = 0.f;
     }
-    else if (p && time_stunned == 0.0f)
+    else if (player && time_stunned == 0.0f)
     {
       /* Player is on the right or left*/
-      target_velocity = (p->get_pos().x > get_pos().x) ? walk_speed : (-1.f) * walk_speed;
+      target_velocity = (player->get_pos().x > get_pos().x) ? walk_speed : (-1.f) * walk_speed;
     }
 
     WalkingBadguy::active_update(dt_sec, target_velocity, 3.f);

src/badguy/haywire.cpp

@@ -518,7 +518,7 @@ IceCrusher::after_editor_set() {
 bool
 IceCrusher::found_victim_down() const
 {
-  if (auto* player = Sector::get().get_nearest_player(m_col.m_bbox))
+  for (auto* player : Sector::get().get_players())
   {
     const Rectf& player_bbox = player->get_bbox();
     Rectf crush_area_down = Rectf(m_col.m_bbox.get_left()+1, m_col.m_bbox.get_bottom(),
@@ -537,7 +537,7 @@ IceCrusher::found_victim_down() const
 bool
 IceCrusher::found_victim_up() const
 {
-  if (auto* player = Sector::get().get_nearest_player(m_col.m_bbox))
+  for (auto* player : Sector::get().get_players())
   {
     const Rectf& player_bbox = player->get_bbox();
     Rectf crush_area_up = Rectf(m_col.m_bbox.get_left()+1, m_col.m_bbox.get_top(),
@@ -556,7 +556,7 @@ IceCrusher::found_victim_up() const
 bool
 IceCrusher::found_victim_right() const
 {
-  if (auto* player = Sector::get().get_nearest_player(m_col.m_bbox))
+  for (auto* player : Sector::get().get_players())
   {
     const Rectf& player_bbox = player->get_bbox();
     Rectf crush_area_right = get_bbox();
@@ -575,7 +575,7 @@ IceCrusher::found_victim_right() const
 bool
 IceCrusher::found_victim_left() const
 {
-  if (auto* player = Sector::get().get_nearest_player(m_col.m_bbox))
+  for (auto* player : Sector::get().get_players())
   {
     const Rectf& player_bbox = player->get_bbox();
     Rectf crush_area_left = get_bbox();
@@ -596,7 +596,7 @@ IceCrusher::eye_position(bool right) const
 {
   if (state == IDLE || state == CRUSHING_RIGHT || state == CRUSHING_LEFT)
   {
-    if (auto* player = Sector::get().get_nearest_player (m_col.m_bbox))
+    if (auto* player = Sector::get().get_nearest_player(m_col.m_bbox))
     {
       // Icecrusher focuses on approximate position of player's head
       const float player_focus_x = (player->get_bbox().get_right() + player->get_bbox().get_left()) * 0.5f;

src/badguy/icecrusher.cpp

@@ -131,6 +131,7 @@ Yeti::draw_hit_points(DrawingContext& context)
   {
     context.push_transform();
     context.set_translation(Vector(0, 0));
+    context.transform().scale = 1.f;
 
     for (int i = 0; i < hit_points; ++i)
     {

src/badguy/yeti.cpp

@@ -19,6 +19,12 @@
 #include <algorithm>
 
 #include "control/input_manager.hpp"
+#include "object/player.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/game_session.hpp"
+#include "supertux/savegame.hpp"
+#include "supertux/sector.hpp"
 #include "util/log.hpp"
 
 GameControllerManager::GameControllerManager(InputManager* parent) :
@@ -34,15 +40,26 @@ GameControllerManager::~GameControllerManager()
 {
   for (const auto& con : m_game_controllers)
   {
-    SDL_GameControllerClose(con);
+    SDL_GameControllerClose(con.first);
   }
 }
 
 void
 GameControllerManager::process_button_event(const SDL_ControllerButtonEvent& ev)
 {
+  int player_id;
+
+  {
+    auto it = m_game_controllers.find(SDL_GameControllerFromInstanceID(ev.which));
+
+    if (it == m_game_controllers.end() || it->second < 0)
+      return;
+
+    player_id = it->second;
+  }
+
   //log_info << "button event: " << static_cast<int>(ev.button) << " " << static_cast<int>(ev.state) << std::endl;
-  Controller& controller = m_parent->get_controller();
+  Controller& controller = m_parent->get_controller(player_id);
   auto set_control = [this, &controller](Control control, Uint8 value)
   {
     m_button_state[static_cast<int>(control)] = (value != 0);
@@ -116,11 +133,22 @@ GameControllerManager::process_button_event(const SDL_ControllerButtonEvent& ev)
 void
 GameControllerManager::process_axis_event(const SDL_ControllerAxisEvent& ev)
 {
+  int player_id;
+
+  {
+    auto it = m_game_controllers.find(SDL_GameControllerFromInstanceID(ev.which));
+
+    if (it == m_game_controllers.end() || it->second < 0)
+      return;
+
+    player_id = it->second;
+  }
+
   // FIXME: buttons and axis are fighting for control ownership, need
   // to OR the values together
 
   //log_info << "axis event: " << static_cast<int>(ev.axis) << " " << ev.value << std::endl;
-  Controller& controller = m_parent->get_controller();
+  Controller& controller = m_parent->get_controller(player_id);
   auto set_control = [this, &controller](Control control, bool value)
   {
     m_stick_state[static_cast<int>(control)] = value;
@@ -192,27 +220,146 @@ GameControllerManager::on_controller_added(int joystick_index)
     }
     else
     {
-      m_game_controllers.push_back(game_controller);
+      m_game_controllers[game_controller] = -1;
+
+      if (m_parent->m_use_game_controller && g_config->multiplayer_auto_manage_players)
+      {
+        int id = m_parent->get_num_users();
+        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;
+            break;
+          }
+        }
+
+        if (id == m_parent->get_num_users())
+          m_parent->push_user();
+
+        m_game_controllers[game_controller] = id;
+
+        if (GameSession::current() && !GameSession::current()->get_savegame().is_title_screen() && id != 0)
+        {
+          auto& sector = GameSession::current()->get_current_sector();
+          auto& player_status = GameSession::current()->get_savegame().get_player_status();
+
+          if (player_status.m_num_players <= id)
+            player_status.add_player();
+
+          // ID = 0 is impossible, so no need to write `(id == 0) ? "" : ...`
+          auto& player = sector.add<Player>(player_status, "Tux" + std::to_string(id + 1), id);
+
+          player.multiplayer_prepare_spawn();
+        }
+      }
     }
   }
 }
 
 void
 GameControllerManager::on_controller_removed(int instance_id)
 {
-  for (auto& controller : m_game_controllers)
+  std::vector<SDL_GameController*> erase_us;
+
+  auto it = std::find_if(m_game_controllers.begin(), m_game_controllers.end(), [instance_id] (decltype(m_game_controllers)::const_reference pair) {
+    return SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(pair.first)) == instance_id;
+  });
+
+  if (it != m_game_controllers.end())
   {
-    auto joy = SDL_GameControllerGetJoystick(controller);
-    SDL_JoystickID id = SDL_JoystickInstanceID(joy);
-    if (id == instance_id)
+    SDL_GameControllerClose(it->first);
+
+    auto deleted_player_id = it->second;
+
+    m_game_controllers.erase(it);
+
+    if (m_parent->m_use_game_controller && g_config->multiplayer_auto_manage_players
+        && deleted_player_id != 0 && !m_parent->m_uses_keyboard[deleted_player_id])
     {
-      SDL_GameControllerClose(controller);
-      controller = nullptr;
+      // Sectors in worldmaps have no Player's of that class
+      if (Sector::current() && Sector::current()->get_object_count<Player>() > 0)
+      {
+        auto players = Sector::current()->get_objects_by_type<Player>();
+        auto it_players = players.begin();
+
+        while (it_players != players.end())
+        {
+          if (it_players->get_id() == deleted_player_id)
+            it_players->remove_me();
+
+          it_players++;
+        }
+      }
     }
   }
+  else
+  {
+    log_debug << "Controller was unplugged but was not initially detected: "
+              << SDL_JoystickName(SDL_JoystickFromInstanceID(instance_id))
+              << std::endl;
+  }
+}
+
+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;
 
-  m_game_controllers.erase(std::remove(m_game_controllers.begin(), m_game_controllers.end(), nullptr),
-                           m_game_controllers.end());
+  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.cpp

@@ -17,8 +17,9 @@
 #ifndef HEADER_SUPERTUX_CONTROL_GAME_CONTROLLER_MANAGER_HPP
 #define HEADER_SUPERTUX_CONTROL_GAME_CONTROLLER_MANAGER_HPP
 
-#include <vector>
 #include <array>
+#include <vector>
+#include <unordered_map>
 
 #include "control/controller.hpp"
 
@@ -28,6 +29,11 @@ struct SDL_ControllerButtonEvent;
 struct _SDL_GameController;
 typedef struct _SDL_GameController SDL_GameController;
 
+/**
+ * Manages GameControllers.
+ * 
+ * WARNING: Any edit done to this class should also be done to JoystickManager!
+ */
 class GameControllerManager final
 {
 public:
@@ -40,10 +46,20 @@ 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:
   InputManager* m_parent;
   int m_deadzone;
-  std::vector<SDL_GameController*> m_game_controllers;
+  std::unordered_map<SDL_GameController*, int> m_game_controllers;
   std::array<bool, static_cast<int>(Control::CONTROLCOUNT)> m_stick_state;
   std::array<bool, static_cast<int>(Control::CONTROLCOUNT)> m_button_state;