games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

forward declaration

Browse Source
This commit is contained in:
Laserlicht
2023-09-23 02:14:45 +02:00
committed by GitHub
parent 049f90159d
commit e18a4a09a9
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/CServerHandler.cpp
View File

@@ -676,10 +676,10 @@ void CServerHandler::startCampaignScenario(HighScoreParameter param, std::shared
if (!cs) if (!cs)
{ {
ourCampaign = si->campState; ourCampaign = si->campState;
calc.isCampaign = true; calc->isCampaign = true;
calc.parameters.clear(); calc->parameters.clear();
} }
calc.parameters.push_back(param); calc->parameters.push_back(param);
GH.dispatchMainThread([ourCampaign, this]() GH.dispatchMainThread([ourCampaign, this]()
{ {
@@ -703,7 +703,7 @@ void CServerHandler::startCampaignScenario(HighScoreParameter param, std::shared
else else
{ {
CMM->openCampaignScreen(ourCampaign->campaignSet); CMM->openCampaignScreen(ourCampaign->campaignSet);
GH.windows().createAndPushWindow<CHighScoreInputScreen>(true, calc); GH.windows().createAndPushWindow<CHighScoreInputScreen>(true, *calc);
} }
}; };
if(epilogue.hasPrologEpilog) if(epilogue.hasPrologEpilog)

7
client/CServerHandler.h
View File

@@ -14,8 +14,6 @@
#include "../lib/StartInfo.h" #include "../lib/StartInfo.h"
#include "../lib/CondSh.h" #include "../lib/CondSh.h"
#include "mainmenu/CHighScoreScreen.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
class CConnection; class CConnection;
@@ -37,6 +35,9 @@ VCMI_LIB_NAMESPACE_END
class CClient; class CClient;
class CBaseForLobbyApply; class CBaseForLobbyApply;
class HighScoreCalculation;
class HighScoreParameter;
// TODO: Add mutex so we can't set CONNECTION_CANCELLED if client already connected, but thread not setup yet // TODO: Add mutex so we can't set CONNECTION_CANCELLED if client already connected, but thread not setup yet
enum class EClientState : ui8 enum class EClientState : ui8
{ {
@@ -88,7 +89,7 @@ class CServerHandler : public IServerAPI, public LobbyInfo
std::vector<std::string> myNames; std::vector<std::string> myNames;
HighScoreCalculation calc; std::shared_ptr<HighScoreCalculation> calc;
void threadHandleConnection(); void threadHandleConnection();
void threadRunServer(); void threadRunServer();