CLIENT-MENU: Merge the-merge to make this branch up to date

MINOR
X-R-G-B · Nov 5, 2023 · 6237434 · 6237434
2 parents a98b239 + 2c7a154
commit 6237434
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/src/Client/Systems/Menus/Menu/ButtonCallbacks.hpp b/src/Client/Systems/Menus/Menu/ButtonCallbacks.hpp
@@ -41,9 +41,9 @@ namespace Menu {
                 {GO_SELECT_LOBBY,  "goToSelectLobby"                 },
                 {CREATE_NORMAL,    "onButtonCreateLobbyNormalClicked"},
                 {SEND_READY,       "sendReadyPacket"                 },
-                {GO_CREATE_SERVER,       "goCreateServer"                 },
-                {CREATE_SERVER,       "createServer"                 },
-                {GO_MENU,       "goToMenu"                 },
+                {GO_CREATE_SERVER, "goCreateServer"                  },
+                {CREATE_SERVER,    "createServer"                    },
+                {GO_MENU,          "goToMenu"                        },
         });
 
         void initConnection();
@@ -71,18 +71,21 @@ namespace Menu {
         void createServer();
 
         const std::unordered_map<CallbackType, std::function<void()>> callbacks = {
-            {CallbackType::DEFAULT_CALLBACK, &defaultCallBack                 },
-            {CallbackType::INIT_CONNECTION,  &initConnection                  },
-            {CallbackType::CONNECT,          &connectLobbySelected            },
-            {CallbackType::CREATE,           &onButtonGotoCreateLobbyClicked  },
-            {CallbackType::GO_SELECT_LOBBY,  &gotToSelectLobby                },
-            {CallbackType::GO_BACK,          &goBackPage                      },
-            {CallbackType::GO_NEXT,          &goNextPage                      },
-            {CallbackType::CREATE_NORMAL,    &onButtonCreateLobbyNormalClicked},
-            {CallbackType::SEND_READY,       &sendReadyPacket               },
-            {CallbackType::GO_CREATE_SERVER,       &goCreateServer                },
-            {CallbackType::CREATE_SERVER,       &createServer                },
-            {CallbackType::GO_MENU,       &goMenu,                }
+            {CallbackType::DEFAULT_CALLBACK, &defaultCallBack},
+            {CallbackType::INIT_CONNECTION, &initConnection},
+            {CallbackType::CONNECT, &connectLobbySelected},
+            {CallbackType::CREATE, &onButtonGotoCreateLobbyClicked},
+            {CallbackType::GO_SELECT_LOBBY, &gotToSelectLobby},
+            {CallbackType::GO_BACK, &goBackPage},
+            {CallbackType::GO_NEXT, &goNextPage},
+            {CallbackType::CREATE_NORMAL, &onButtonCreateLobbyNormalClicked},
+            {CallbackType::SEND_READY, &sendReadyPacket},
+            {CallbackType::GO_CREATE_SERVER, &goCreateServer},
+            {CallbackType::CREATE_SERVER, &createServer},
+            {
+             CallbackType::GO_MENU,
+             &goMenu,
+             }
         };
     } // namespace Callback
 } // namespace Menu
diff --git a/src/Client/Systems/Menus/Menu/Menu.cpp b/src/Client/Systems/Menus/Menu/Menu.cpp
@@ -128,10 +128,11 @@ namespace Menu {
 
     static std::size_t initButtonFromSprite(nlohmann::json &elem, std::function<void()> &callback)
     {
-
         std::size_t id = Registry::getInstance().addEntity();
         initFromSprite(elem);
-        std::string name = Json::isDataExist(elem, "name") ? Json::getInstance().getDataFromJson<std::string>(elem, "name") : "";
+        std::string name = Json::isDataExist(elem, "name")
+            ? Json::getInstance().getDataFromJson<std::string>(elem, "name")
+            : "";
         Types::Button button(callback, name);
         Types::Position position = {
             Types::Position(Json::getInstance().getDataFromJson<Types::Position>(elem, "position"))};

diff --git a/src/init.cpp b/src/init.cpp
@@ -67,9 +67,9 @@ void initScenes()
     });
     auto selectLobby  = enumListTosizet(
         {SystemManagers::MENU_SYSTEMS,
-         SystemManagers::NETWORK_MENU,
-         SystemManagers::ECSSYSTEMS,
-         SystemManagers::GRAPHICS});
+          SystemManagers::NETWORK_MENU,
+          SystemManagers::ECSSYSTEMS,
+          SystemManagers::GRAPHICS});
     auto createLobby = enumListTosizet(
         {SystemManagers::MENU_SYSTEMS,
          SystemManagers::NETWORK_CREATE_LOBBY,