Merge branch 'the-merge' of github.com:X-R-G-B/R-Bus into the-merge

X-R-G-B · Nov 5, 2023 · 9c9da26 · 9c9da26
2 parents 9fab871 + 30f7b28
commit 9c9da26
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/src/Client/Systems/Events/EventsSystems.cpp b/src/Client/Systems/Events/EventsSystems.cpp
@@ -272,7 +272,7 @@ namespace Systems {
     {
         constexpr std::size_t secondBeforeEnd = 5;
         static std::size_t clockId            = Registry::getInstance().getClock().create(false);
-        static bool restart = false;
+        static bool restart                   = false;
         std::size_t elapsedSeconds = Registry::getInstance().getClock().elapsedSecondsSince(clockId);
         std::string seconds        = std::to_string(secondBeforeEnd - elapsedSeconds);
         std::string endGameMessage;

diff --git a/src/Client/Systems/Menus/Menu/MenuSystems.cpp b/src/Client/Systems/Menus/Menu/MenuSystems.cpp
@@ -12,11 +12,11 @@
 #include "B-luga-physics/ECSCustomTypes.hpp"
 #include "B-luga/Maths/Maths.hpp"
 #include "B-luga/SceneManager.hpp"
+#include "GameCustomTypes.hpp"
 #include "Menu.hpp"
 #include "NitworkClient.hpp"
 #include "Parallax.hpp"
 #include "ResourcesManager.hpp"
-#include "GameCustomTypes.hpp"
 #include "SelectLobbySystems.hpp"
 #include "init.hpp"
 

diff --git a/src/Game/GameCustomTypes.hpp b/src/Game/GameCustomTypes.hpp
@@ -213,10 +213,10 @@ namespace Types {
             void reset()
             {
                 _remainingEnemies.clear();
-                _waveId = 0;
+                _waveId              = 0;
                 _isFirstEnemyCreated = false;
-                _waitingForNextWave = false;
-                _clockId = Registry::getInstance().getClock().create(false);
+                _waitingForNextWave  = false;
+                _clockId             = Registry::getInstance().getClock().create(false);
             }
 
         private:

diff --git a/src/Nitwork/NitworkMainServer.cpp b/src/Nitwork/NitworkMainServer.cpp
@@ -139,7 +139,8 @@ namespace Nitwork {
         it->second.first(it->second.second, header);
     }
 
-    void NitworkMainServer::handleLobbyPidMsg(const std::any &data, boost::asio::ip::udp::endpoint &endpoint)
+    void
+    NitworkMainServer::handleLobbyPidMsg(const std::any &data, boost::asio::ip::udp::endpoint &endpoint)
     {
         const struct msgReplaceLobbyPid_s &msg = std::any_cast<struct msgReplaceLobbyPid_s>(data);
 

diff --git a/src/Nitwork/NitworkServer.cpp b/src/Nitwork/NitworkServer.cpp
@@ -350,8 +350,9 @@ namespace Nitwork {
                 Logger::error("Error: execl failed");
             }
         } else {
-            sendLobbyPid(boost::asio::ip::udp::endpoint(
-                             boost::asio::ip::address::from_string(ownerIp), ownerPort), c_pid);
+            sendLobbyPid(
+                boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(ownerIp), ownerPort),
+                c_pid);
         }
 #endif
     }
@@ -369,7 +370,12 @@ namespace Nitwork {
             Logger::error("Invalid name: " + name);
             return;
         }
-        forkProcessAndCreateLobby(maxNbPlayer, gameType, name, _serverInfos.ownerInfos.ip, _serverInfos.ownerInfos.port);
+        forkProcessAndCreateLobby(
+            maxNbPlayer,
+            gameType,
+            name,
+            _serverInfos.ownerInfos.ip,
+            _serverInfos.ownerInfos.port);
     }
 
     void NitworkServer::sendLobbyPid(const boost::asio::ip::udp::endpoint &endpoint, pid_t pid)

diff --git a/src/Nitwork/NitworkServer.hpp b/src/Nitwork/NitworkServer.hpp
@@ -216,10 +216,7 @@ namespace Nitwork {
              * @param name The name of the lobby
              * @param gameType The type of the game
              */
-            void recreateLobby(
-                unsigned int maxNbPlayer,
-                const std::string &name,
-                enum gameType_e gameType);
+            void recreateLobby(unsigned int maxNbPlayer, const std::string &name, enum gameType_e gameType);
 
             /**
              * @brief A map that contain the endpoint of the clients and their infos