General cleanup part 2, and GP related updates

src/items/bowling.cpp

@@ -24,10 +24,10 @@
 #include "graphics/material.hpp"
 #include "io/xml_node.hpp"
 #include "karts/abstract_kart.hpp"
+#include "guiengine/engine.hpp"
+#include "config/stk_config.hpp"
 // #include "modes/linear_world.hpp"
 
-#include "network/protocols/server_lobby.hpp"
-
 #include "utils/hit_processor.hpp"
 #include "utils/log.hpp" //TODO: remove after debugging is done
 
@@ -157,20 +157,20 @@ bool Bowling::updateAndDelete(int ticks)
  */
 bool Bowling::hit(AbstractKart* kart, PhysicalObject* obj)
 {
-    auto sl = LobbyProtocol::get<ServerLobby>();
-    if (sl)
-        sl->getHitProcessor()->setTeammateHitOwner(getOwnerId(),m_ticks_since_thrown);
+    auto hp = kart->getHitProcessor();
+    if (hp)
+        hp->setTeammateHitOwner(getOwnerId(),m_ticks_since_thrown);
 
     bool was_real_hit = Flyable::hit(kart, obj);
     if (was_real_hit)
     {
         if (kart && kart->isShielded())
         {
             kart->decreaseShieldTime();
-            if (sl)
+            if (hp)
             {
-                sl->getHitProcessor()->registerTeammateHit(kart->getWorldKartId());
-                sl->getHitProcessor()->handleTeammateHits();
+                hp->registerTeammateHit(kart->getWorldKartId());
+                hp->handleTeammateHits();
             }
             return true;
         }
@@ -180,8 +180,8 @@ bool Bowling::hit(AbstractKart* kart, PhysicalObject* obj)
             explode(kart, obj, /*hit_secondary*/false);
         }
     }
-    if (sl)
-        sl->getHitProcessor()->handleTeammateHits();
+    if (hp)
+        hp->handleTeammateHits();
     return was_real_hit;
 }   // hit
 

src/items/cake.cpp

@@ -27,8 +27,6 @@
 #include "utils/hit_processor.hpp"
 #include "utils/random_generator.hpp"
 
-#include "network/protocols/server_lobby.hpp"
-
 #include "utils/log.hpp" //TODO: remove after debugging is done
 
 float Cake::m_st_max_distance_squared;
@@ -64,28 +62,28 @@ void Cake::init(const XMLNode &node, scene::IMesh *cake_model)
  */
 bool Cake::hit(AbstractKart* kart, PhysicalObject* obj)
 {
-    auto sl = LobbyProtocol::get<ServerLobby>();
-    if (sl)
-        sl->getHitProcessor()->setTeammateHitOwner(getOwnerId());
+    auto hp = kart->getHitProcessor();
+    if (hp)
+        hp->setTeammateHitOwner(getOwnerId());
 
     bool was_real_hit = Flyable::hit(kart, obj);
     if (was_real_hit)
     {
         if (kart && kart->isShielded())
         {
             kart->decreaseShieldTime();
-            if (sl)
+            if (hp)
             {
-                sl->getHitProcessor()->registerTeammateHit(kart->getWorldKartId());
-                sl->getHitProcessor()->handleTeammateHits();
+                hp->registerTeammateHit(kart->getWorldKartId());
+                hp->handleTeammateHits();
             }
             return false; //Not sure if a shield hit is a real hit.
         }
         explode(kart, obj);
     }
 
-    if (sl)
-        sl->getHitProcessor()->handleTeammateHits();
+    if (hp)
+        hp->handleTeammateHits();
     return was_real_hit;
 }   // hit
 

src/items/powerup.cpp

@@ -39,8 +39,6 @@
 #include "utils/string_utils.hpp"
 #include "utils/log.hpp" //TODO: remove after debugging is done
 
-#include "network/protocols/server_lobby.hpp"
-
 //-----------------------------------------------------------------------------
 /** Constructor, stores the kart to which this powerup belongs.
  *  \param kart The kart to which this powerup belongs.
@@ -404,9 +402,9 @@ void Powerup::use()
             if(kart->getPosition() == 1)
             {
                 // check if we are in team gp and hit a teammate and should punish the attacker
-                auto sl = LobbyProtocol::get<ServerLobby>();
-                if(sl && !kart->hasFinishedRace())
-                    sl->getHitProcessor()->handleAnvilHit(m_kart->getWorldKartId(), kart->getWorldKartId());
+                auto hp = kart->getHitProcessor();
+                if(hp && !kart->hasFinishedRace())
+                    hp->handleAnvilHit(m_kart->getWorldKartId(), kart->getWorldKartId());
 
                 kart->getAttachment()->set(Attachment::ATTACH_ANVIL,
                                            stk_config->

src/items/swatter.cpp

@@ -42,7 +42,6 @@
 #include "modes/capture_the_flag.hpp"
 #include "network/network_string.hpp"
 #include "network/rewind_manager.hpp"
-#include "network/protocols/server_lobby.hpp"
 #include "utils/hit_processor.hpp"
 #include <IAnimatedMeshSceneNode.h>
 
@@ -398,7 +397,7 @@ void Swatter::squashThingsAround()
     const KartProperties *kp = m_kart->getKartProperties();
 
     float duration = kp->getSwatterSquashDuration();
-    float slowdown =  kp->getSwatterSquashSlowdown();
+    float slowdown = kp->getSwatterSquashSlowdown();
     // The squash attempt may fail because of invulnerability, shield, etc.
     // Making a bomb explode counts as a success
     bool wasHit = !m_closest_kart->isInvulnerable() && !m_closest_kart->getKartAnimation();
@@ -411,9 +410,9 @@ void Swatter::squashThingsAround()
     if (wasHit)
     {
         // check if we are in team gp and hit a teammate and should punish attacker
-        auto sl = LobbyProtocol::get<ServerLobby>();
-        if (sl && !m_closest_kart->hasFinishedRace())
-            sl->getHitProcessor()->handleSwatterHit(m_kart->getWorldKartId(),
+        auto hp = m_kart->getHitProcessor();
+        if (hp && !m_closest_kart->hasFinishedRace())
+            hp->handleSwatterHit(m_kart->getWorldKartId(),
                 m_closest_kart->getWorldKartId(), success, m_has_hit_kart,
                 World::getWorld()->getTicksSinceStart() - m_created_ticks);
     }

src/karts/abstract_kart.cpp

@@ -28,6 +28,7 @@
 #include "karts/kart_properties_manager.hpp"
 #include "karts/official_karts.hpp"
 #include "network/network_config.hpp"
+#include "utils/hit_processor.hpp"
 #include "physics/physics.hpp"
 #include "utils/log.hpp"
 #include "utils/string_utils.hpp"
@@ -276,3 +277,9 @@ void AbstractKart::makeKartRest()
     body->proceedToTransform(t);
     setTrans(t);
 }   // makeKartRest
+
+// ----------------------------------------------------------------------------
+std::shared_ptr<HitProcessor> AbstractKart::getHitProcessor() const
+{
+    return RaceManager::get()->getHitProcessor();
+}   // getHitProcessor

src/karts/abstract_kart.hpp

@@ -25,6 +25,7 @@
 #include "karts/moveable.hpp"
 #include "karts/controller/kart_control.hpp"
 #include "race/race_manager.hpp"
+class HitProcessor;
 
 namespace irr
 {
@@ -550,6 +551,8 @@ class AbstractKart : public Moveable
     /** Return the confirmed finish ticks (sent by the server)
      *  indicating that this kart has really finished the race. */
     virtual int getNetworkConfirmedFinishTicks() const = 0;
+    // ------------------------------------------------------------------------
+    std::shared_ptr<HitProcessor> getHitProcessor() const;
 };   // AbstractKart
 
 

src/karts/explosion_animation.cpp

@@ -28,7 +28,6 @@
 #include "modes/follow_the_leader.hpp"
 #include "network/network_string.hpp"
 #include "network/protocols/client_lobby.hpp"
-#include "network/protocols/server_lobby.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/track.hpp"
 #include "utils/hit_processor.hpp"
@@ -57,13 +56,13 @@ ExplosionAnimation *ExplosionAnimation::create(AbstractKart *kart,
     // Ignore explosion that are too far away.
     if(!direct_hit && pos.distance2(kart->getXYZ())>r*r) return NULL;
 
-    auto sl = LobbyProtocol::get<ServerLobby>();
+    auto hp = kart->getHitProcessor();
 
     if(kart->isShielded())
     {
         kart->decreaseShieldTime();
-        if (sl)
-            sl->getHitProcessor()->registerTeammateHit(kart->getWorldKartId());
+        if (hp)
+            hp->registerTeammateHit(kart->getWorldKartId());
         return NULL;
     }
 
@@ -75,8 +74,8 @@ ExplosionAnimation *ExplosionAnimation::create(AbstractKart *kart,
             ftl_world->leaderHit();
     }
 
-    if (sl)
-        sl->getHitProcessor()->registerTeammateExplode(kart->getWorldKartId());
+    if (hp)
+        hp->registerTeammateExplode(kart->getWorldKartId());
     return new ExplosionAnimation(kart, direct_hit);
 }   // create
 

src/network/database_connector.cpp

@@ -1016,7 +1016,7 @@ void DatabaseConnector::onPlayerJoinQueries(std::shared_ptr<STKPeer> peer,
             peer->getAddress().toString(false),
             peer->getAddress().getPort(),
             online_id,
-            Binder(coll, StringUtils::wideToUtf8(peer->getPlayerProfiles()[0]->getName()), "player_name"),
+            Binder(coll, peer->getMainName(), "player_name"),
             player_count,
             Binder(coll, country_code, "country_code", true),
             Binder(coll, version_os.first, "version"),
@@ -1043,7 +1043,7 @@ void DatabaseConnector::onPlayerJoinQueries(std::shared_ptr<STKPeer> peer,
             peer->getAddress().getIP(),
             peer->getAddress().getPort(),
             online_id,
-            Binder(coll, StringUtils::wideToUtf8(peer->getPlayerProfiles()[0]->getName()), "player_name"),
+            Binder(coll, peer->getMainName(), "player_name"),
             player_count,
             Binder(coll, country_code, "country_code", true),
             Binder(coll, version_os.first, "version"),

src/network/game_setup.cpp

@@ -30,6 +30,7 @@
 #include "network/stk_host.hpp"
 #include "race/race_manager.hpp"
 #include "utils/file_utils.hpp"
+#include "utils/lobby_settings.hpp"
 #include "utils/log.hpp"
 #include "utils/stk_process.hpp"
 #include "utils/string_utils.hpp"
@@ -138,14 +139,14 @@ void GameSetup::addServerInfo(NetworkString* ns)
     if (ServerConfig::m_owner_less)
     {
         ns->addUInt8(ServerConfig::m_min_start_game_players)
-            .addFloat(std::max<float>(0.0f, ServerConfig::m_start_game_counter));
+            .addFloat(std::max<float>(0.0f, getSettings()->getStartGameCounter()));
     }
     else
         ns->addUInt8(0).addFloat(0.0f);
 
     ns->encodeString16(m_message_of_today);
-    ns->addUInt8((uint8_t)ServerConfig::m_server_configurable);
-    ns->addUInt8(ServerConfig::m_live_players? 1 : 0);
+    ns->addUInt8((uint8_t)getSettings()->getServerConfigurable());
+    ns->addUInt8(getSettings()->isLivePlayers() ? 1 : 0);
 }   // addServerInfo
 
 //-----------------------------------------------------------------------------

src/network/game_setup.hpp

@@ -23,6 +23,7 @@
 #define GAME_SETUP_HPP
 
 #include <irrString.h>
+#include "utils/lobby_context.hpp"
 
 #include <atomic>
 #include <cassert>
@@ -39,7 +40,7 @@ class PeerVote;
  *  \brief Used to store the needed data about the players that join a game.
  *  This class stores all the possible information about players in a lobby.
  */
-class GameSetup
+class GameSetup: public LobbyContextUser
 {
 private:
     std::vector<std::string> m_tracks;