Fix a bit of mess in sendXXXToYYY functions

- Move sendString, sendPacket to Comm::
- Keep sendPacketPtr, sendNetstring to STKHost
- Leave a few sendNetstring-s in Comm:: as deprecated.

[skip ci]

Author: kimden

src/modes/capture_the_flag.cpp

@@ -35,6 +35,7 @@
 #include "states_screens/race_gui.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_object_manager.hpp"
+#include "utils/communication.hpp"
 #include "utils/game_info.hpp"
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
@@ -346,7 +347,7 @@ void CaptureTheFlag::checkScoring(FlagColor color)
                 packet.kart_score = (int16_t)new_kart_score;
                 packet.red_score = (uint8_t)new_red_score;
                 packet.blue_score = (uint8_t)new_blue_score;
-                STKHost::get()->sendPacketToAllPeers(packet);
+                Comm::sendPacketToPeers(packet);
             }
             ctfScored(active_holder, (red_active) ? false : true /*red_team_scored*/,
                 new_kart_score, new_red_score, new_blue_score); 

src/modes/free_for_all.cpp

@@ -23,6 +23,7 @@
 #include "network/protocols/game_events_protocol.hpp"
 #include "network/stk_host.hpp"
 #include "tracks/track.hpp"
+#include "utils/communication.hpp"
 #include "utils/string_utils.hpp"
 
 #include <algorithm>
@@ -136,7 +137,7 @@ void FreeForAll::handleScoreInServer(int kart_id, int hitter)
             packet.new_score = (int16_t)new_score;
         }
 
-        STKHost::get()->sendPacketToAllPeers(packet);
+        Comm::sendPacketToPeers(packet);
     }
 }   // handleScoreInServer
 
@@ -362,6 +363,6 @@ void FreeForAll::notifyAboutScoreIfNonzero(int id)
         packet.hitter_kart = (uint8_t)id;
         packet.new_score = (int16_t)m_scores[id];
 
-        STKHost::get()->sendPacketToAllPeers(packet);
+        Comm::sendPacketToPeers(packet);
     }
 }   // notifyAboutScoreIfNonzero

src/modes/linear_world.cpp

@@ -47,6 +47,7 @@
 #include "tracks/drive_node.hpp"
 #include "tracks/track_sector.hpp"
 #include "tracks/track.hpp"
+#include "utils/communication.hpp"
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
@@ -1357,7 +1358,7 @@ void LinearWorld::updateCheckLinesServer(int check_id, int kart_id)
                 cm->getCheckStructure(i)->saveIsActive(kart_id));
     }
 
-    STKHost::get()->sendPacketToAllPeers(packet);
+    Comm::sendPacketToPeers(packet);
 }   // updateCheckLinesServer
 
 // ----------------------------------------------------------------------------

src/modes/soccer_world.cpp

@@ -43,6 +43,7 @@
 #include "tracks/track.hpp"
 #include "tracks/track_object_manager.hpp"
 #include "tracks/track_sector.hpp"
+#include "utils/communication.hpp"
 #include "utils/constants.hpp"
 #include "utils/game_info.hpp"
 #include "utils/translation.hpp"
@@ -978,7 +979,7 @@ void SoccerWorld::updateBallPosition(int ticks)
 
                     ResetBallPacket packet;
                     packet.reset_ball_ticks = m_reset_ball_ticks;
-                    STKHost::get()->sendPacketToAllPeers(packet);
+                    Comm::sendPacketToPeers(packet);
                 }
                 else if (!NetworkConfig::get()->isNetworking())
                 {

src/network/network_console.cpp

@@ -210,7 +210,7 @@ void mainLoop(STKHost* host)
                 message.pop_back();
             auto sl = LobbyProtocol::get<ServerLobby>();
             if (sl && !message.empty())
-                Comm::sendStringToAllPeers(message);
+                Comm::sendStringToPeers(message);
         }
         else
         {

src/network/protocol.hpp

@@ -24,6 +24,7 @@
 #define PROTOCOL_HPP
 
 #include "utils/no_copy.hpp"
+#include "utils/constants.hpp"
 
 #include <memory>
 #include <stddef.h>
@@ -121,72 +122,6 @@ class Protocol : public std::enable_shared_from_this<Protocol>,
     NetworkString* getNetworkString(size_t capacity = 16) const;
     bool checkDataSize(Event* event, unsigned int minimum_size);
 
-    // ----------------------------------------------------------------------------
-    template<typename T>
-    typename std::enable_if<std::is_base_of<Packet, T>::value, void>::type
-    sendPacketToPeers(const T& packet,
-            PacketReliabilityMode reliable = PRM_RELIABLE) const
-    {
-        std::shared_ptr<T> ptr1 = std::make_shared<T>(packet);
-        std::shared_ptr<Packet> ptr2 = std::dynamic_pointer_cast<Packet>(ptr1);
-        return sendPacketPtrToPeers(ptr2, reliable);
-    }
-
-    template<typename T>
-    typename std::enable_if<std::is_base_of<Packet, T>::value, void>::type
-    sendPacketToPeersInServer(const T& packet,
-            PacketReliabilityMode reliable = PRM_RELIABLE) const
-    {
-        std::shared_ptr<T> ptr1 = std::make_shared<T>(packet);
-        std::shared_ptr<Packet> ptr2 = std::dynamic_pointer_cast<Packet>(ptr1);
-        return sendPacketPtrToPeersInServer(ptr2, reliable);
-    }
-
-    template<typename T>
-    typename std::enable_if<std::is_base_of<Packet, T>::value, void>::type
-    sendPacketToServer(const T& packet,
-            PacketReliabilityMode reliable = PRM_RELIABLE)
-    {
-        std::shared_ptr<T> ptr1 = std::make_shared<T>(packet);
-        std::shared_ptr<Packet> ptr2 = std::dynamic_pointer_cast<Packet>(ptr1);
-        return sendPacketPtrToServer(ptr2, reliable);
-    }
-
-
-    template<typename T>
-    typename std::enable_if<std::is_base_of<Packet, T>::value, void>::type
-    sendPacketExcept(std::shared_ptr<STKPeer> peer, const T& packet,
-            PacketReliabilityMode reliable = PRM_RELIABLE)
-    {
-        std::shared_ptr<T> ptr1 = std::make_shared<T>(packet);
-        std::shared_ptr<Packet> ptr2 = std::dynamic_pointer_cast<Packet>(ptr1);
-        return sendPacketPtrExcept(peer, ptr2, reliable);
-    }
-
-    template<typename T>
-    typename std::enable_if<std::is_base_of<Packet, T>::value, void>::type
-    sendPacketToAllPeersWith(std::function<bool(std::shared_ptr<STKPeer>)> predicate,
-            const T& packet, PacketReliabilityMode reliable = PRM_RELIABLE)
-    {
-        std::shared_ptr<T> ptr1 = std::make_shared<T>(packet);
-        std::shared_ptr<Packet> ptr2 = std::dynamic_pointer_cast<Packet>(ptr1);
-        return sendPacketPtrToAllPeersWith(predicate, ptr2, reliable);
-    }
-    // ----------------------------------------------------------------------------
-    void sendPacketPtrToPeers(std::shared_ptr<Packet> packet,
-            PacketReliabilityMode reliable = PRM_RELIABLE) const;
-
-    void sendPacketPtrToPeersInServer(std::shared_ptr<Packet> packet,
-            PacketReliabilityMode reliable = PRM_RELIABLE) const;
-
-    void sendPacketPtrToServer(std::shared_ptr<Packet> packet,
-            PacketReliabilityMode reliable = PRM_RELIABLE);
-
-    void sendPacketPtrExcept(std::shared_ptr<STKPeer> peer, std::shared_ptr<Packet> packet,
-                                PacketReliabilityMode reliable = PRM_RELIABLE);
-
-    void sendPacketPtrToAllPeersWith(std::function<bool(std::shared_ptr<STKPeer>)> predicate,
-                                        std::shared_ptr<Packet> packet, PacketReliabilityMode reliable = PRM_RELIABLE);
     // ----------------------------------------------------------------------------
     virtual void requestStart();
     virtual void requestTerminate();

src/network/protocols/client_lobby.cpp

@@ -178,7 +178,7 @@ void ClientLobby::setup()
 void ClientLobby::doneWithResults()
 {
     RaceFinishedAckPacket packet;
-    sendPacketToServer(packet);
+    Comm::sendPacketToServer(packet);
 }   // doneWithResults
 
 //-----------------------------------------------------------------------------
@@ -491,7 +491,7 @@ void ClientLobby::update(int ticks)
             }
             delete rest;
 
-            sendPacketToServer(packet);
+            Comm::sendPacketToServer(packet);
 
             if (encryption)
             {
@@ -502,7 +502,7 @@ void ClientLobby::update(int ticks)
         else
         {
             packet.player_info_unencrypted = subpacket;
-            sendPacketToServer(packet);
+            Comm::sendPacketToServer(packet);
         }
 
 
@@ -552,7 +552,7 @@ void ClientLobby::update(int ticks)
             // Send a message to the server to start
             m_auto_started = true;
             RequestBeginPacket packet;
-            sendPacketToServer(packet);
+            Comm::sendPacketToServer(packet);
         }
         if (m_background_download.joinable())
         {
@@ -1294,7 +1294,7 @@ void ClientLobby::finishedLoadingWorld()
 {
     FinishedLoadingLiveJoinPacket packet;
     packet.m_override_synchronous = m_server_send_live_load_world;
-    sendPacketToServer(packet);
+    Comm::sendPacketToServer(packet);
 }   // finishedLoadingWorld
 
 //-----------------------------------------------------------------------------
@@ -1402,7 +1402,7 @@ void ClientLobby::requestKartInfo(uint8_t kart_id)
 {
     KartInfoRequestPacket packet;
     packet.kart_id = kart_id;
-    sendPacketToServer(packet);
+    Comm::sendPacketToServer(packet);
 }   // requestKartInfo
 
 //-----------------------------------------------------------------------------
@@ -1542,7 +1542,7 @@ void ClientLobby::sendChat(irr::core::stringw text, KartTeam team)
         if (team != KART_TEAM_NONE)
             packet.kart_team = team;
 
-        sendPacketToServer(packet);
+        Comm::sendPacketToServer(packet);
     }
 }   // sendChat
 
@@ -1890,7 +1890,7 @@ void ClientLobby::handleClientCommand(const std::string& cmd)
         CommandPacket packet;
         packet.language = UserConfigParams::m_language;
         packet.command = cmd;
-        sendPacketToServer(packet);
+        Comm::sendPacketToServer(packet);
     }
 #endif
 }   // handleClientCommand
@@ -1933,7 +1933,7 @@ void ClientLobby::updateAssetsToServer()
 {
     NewAssetsPacket packet;
     packet.assets = getKartsTracksPacket();
-    sendPacketToServer(packet);
+    Comm::sendPacketToServer(packet);
 }   // updateAssetsToServer
 
 // ----------------------------------------------------------------------------