Add new parameter lua_path to HostGame api

Return-To-The-Roots · Nov 6, 2023 · 04b1a1b · 04b1a1b
1 parent 4f496db
commit 04b1a1b
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 10 deletions.
diff --git a/libs/s25main/QuickStartGame.cpp b/libs/s25main/QuickStartGame.cpp
@@ -87,8 +87,9 @@ bool QuickStartGame(const boost::filesystem::path& mapOrReplayPath, const std::v
 
     WINDOWMANAGER.Switch(std::make_unique<dskSelectMap>(csi));
 
-    if((extension == ".sav" && GAMECLIENT.HostGame(csi, mapOrReplayPath, MapType::Savegame))
-       || ((extension == ".swd" || extension == ".wld") && GAMECLIENT.HostGame(csi, mapOrReplayPath, MapType::OldMap)))
+    if((extension == ".sav" && GAMECLIENT.HostGame(csi, {mapOrReplayPath, MapType::Savegame}))
+       || ((extension == ".swd" || extension == ".wld")
+           && GAMECLIENT.HostGame(csi, {mapOrReplayPath, MapType::OldMap})))
     {
         GAMECLIENT.SetAIBattlePlayers(std::move(aiInfos));
         WINDOWMANAGER.ShowAfterSwitch(std::make_unique<iwConnecting>(csi.type, nullptr));

diff --git a/libs/s25main/desktops/dskCampaignMissionSelection.cpp b/libs/s25main/desktops/dskCampaignMissionSelection.cpp
@@ -121,10 +121,11 @@ void dskCampaignMissionSelection::UpdateMissionPage()
     }
 }
 
-void dskCampaignMissionSelection::StartServer(const boost::filesystem::path& mapPath)
+void dskCampaignMissionSelection::StartServer(const boost::filesystem::path& mapPath,
+                                              const boost::optional<boost::filesystem::path>& luaPath)
 {
     // Start server
-    if(!GAMECLIENT.HostGame(csi_, mapPath, MapType::OldMap))
+    if(!GAMECLIENT.HostGame(csi_, {mapPath, MapType::OldMap, luaPath}))
     {
         WINDOWMANAGER.Show(std::make_unique<iwMsgbox>(_("Error"), _("Hosting of game not possible"), this,
                                                       MsgboxButton::Ok, MsgboxIcon::ExclamationRed, ID_msgBoxError));

diff --git a/libs/s25main/desktops/dskCampaignMissionSelection.h b/libs/s25main/desktops/dskCampaignMissionSelection.h
@@ -7,6 +7,7 @@
 #include "desktops/Desktop.h"
 #include "network/CreateServerInfo.h"
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <boost/signals2/connection.hpp>
 
 struct CampaignDescription;
@@ -20,7 +21,7 @@ class dskCampaignMissionSelection : public Desktop
     void UpdateMissionPage();
     void Msg_ButtonClick(unsigned ctrl_id) override;
     void Msg_Group_ButtonClick(unsigned group_id, unsigned ctrl_id) override;
-    void StartServer(const boost::filesystem::path& mapPath);
+    void StartServer(const boost::filesystem::path& mapPath, const boost::optional<boost::filesystem::path>& luaPath);
     void UpdateEnabledStateOfNextPreviousButton();
     boost::filesystem::path campaignFolder_;
     CreateServerInfo csi_;

diff --git a/libs/s25main/desktops/dskCampaignSelection.cpp b/libs/s25main/desktops/dskCampaignSelection.cpp
@@ -169,7 +169,8 @@ void dskCampaignSelection::Msg_Timer(unsigned ctrl_id)
 void dskCampaignSelection::FillCampaignsTable()
 {
     const size_t numFaultyCampaignsPrior = brokenCampaignPaths_.size();
-    static const std::array<std::string, 2> campaignFolders = {{s25::folders::campaignsBuiltin, s25::folders::campaignsUser}};
+    static const std::array<std::string, 2> campaignFolders = {
+      {s25::folders::campaignsBuiltin, s25::folders::campaignsUser}};
 
     auto* table = GetCtrl<ctrlTable>(ID_Table);
     for(const auto& campaignFolder : campaignFolders)

diff --git a/libs/s25main/desktops/dskSelectMap.cpp b/libs/s25main/desktops/dskSelectMap.cpp
@@ -350,7 +350,7 @@ void dskSelectMap::StartServer()
         const std::string& mapPath = table->GetItemText(*selection, 5);
 
         // Server starten
-        if(!GAMECLIENT.HostGame(csi, mapPath, MapType::OldMap))
+        if(!GAMECLIENT.HostGame(csi, {mapPath, MapType::OldMap}))
             GoBack();
         else
         {

diff --git a/libs/s25main/desktops/dskSinglePlayer.cpp b/libs/s25main/desktops/dskSinglePlayer.cpp
@@ -88,7 +88,7 @@ void dskSinglePlayer::Msg_ButtonClick(const unsigned ctrl_id)
 
                 WINDOWMANAGER.Switch(std::make_unique<dskSelectMap>(csi));
 
-                if(GAMECLIENT.HostGame(csi, mostRecentFilepath, MapType::Savegame))
+                if(GAMECLIENT.HostGame(csi, {mostRecentFilepath, MapType::Savegame}))
                     WINDOWMANAGER.ShowAfterSwitch(std::make_unique<iwConnecting>(csi.type, nullptr));
                 else
                 {

diff --git a/libs/s25main/gameTypes/MapDescription.cpp b/libs/s25main/gameTypes/MapDescription.cpp
@@ -0,0 +1,10 @@
+// Copyright (C) 2005 - 2023 Settlers Freaks (sf-team at siedler25.org)
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "MapDescription.h"
+
+MapDescription::MapDescription(boost::filesystem::path map_path, MapType map_type,
+                               boost::optional<boost::filesystem::path> lua_path)
+    : map_path(std::move(map_path)), map_type(map_type), lua_path(std::move(lua_path))
+{}
diff --git a/libs/s25main/gameTypes/MapDescription.h b/libs/s25main/gameTypes/MapDescription.h
@@ -0,0 +1,19 @@
+// Copyright (C) 2005 - 2023 Settlers Freaks (sf-team at siedler25.org)
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "gameTypes/MapType.h"
+#include <boost/filesystem/path.hpp>
+#include <boost/optional.hpp>
+
+struct MapDescription
+{
+    boost::filesystem::path map_path;
+    MapType map_type;
+    boost::optional<boost::filesystem::path> lua_path;
+
+    MapDescription(boost::filesystem::path map_path, MapType map_type,
+                   boost::optional<boost::filesystem::path> lua_path = boost::none);
+};
diff --git a/libs/s25main/ingameWindows/iwSave.cpp b/libs/s25main/ingameWindows/iwSave.cpp
@@ -199,7 +199,7 @@ void iwLoad::SaveLoad()
     if(!table->GetSelection())
         return;
 
-    if(GAMECLIENT.HostGame(csi, table->GetItemText(*table->GetSelection(), 4), MapType::Savegame))
+    if(GAMECLIENT.HostGame(csi, {table->GetItemText(*table->GetSelection(), 4), MapType::Savegame}))
     {
         std::unique_ptr<ILobbyClient> lobbyClient;
         if(csi.type == ServerType::Lobby)

diff --git a/libs/s25main/network/GameClient.h b/libs/s25main/network/GameClient.h
@@ -13,6 +13,7 @@
 #include "factories/GameCommandFactory.h"
 #include "gameTypes/AIInfo.h"
 #include "gameTypes/ChatDestination.h"
+#include "gameTypes/MapDescription.h"
 #include "gameTypes/MapInfo.h"
 #include "gameTypes/Nation.h"
 #include "gameTypes/ServerType.h"
@@ -79,8 +80,9 @@ class GameClient final :
 
     bool Connect(const std::string& server, const std::string& password, ServerType servertyp, unsigned short port,
                  bool host, bool use_ipv6);
+
     /// Start the server and connect to it
-    bool HostGame(const CreateServerInfo& csi, const boost::filesystem::path& map_path, MapType map_type);
+    bool HostGame(const CreateServerInfo& csi, const MapDescription& map);
     void Run();
     void Stop();