games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-13 13:18:43 +02:00
Code Issues Releases Activity

fix

Browse Source
This commit is contained in:
AlexVinS 2017-11-01 07:42:58 +03:00
parent 75c3e30404
commit 8b5cbf6ba7
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/CVCMIServer.cpp
View File

@ -352,9 +352,9 @@ CVCMIServer::~CVCMIServer()
//delete firstConnection;
}
CGameHandler * CVCMIServer::initGhFromHostingConnection(CConnection &c)
std::shared_ptr<CGameHandler> CVCMIServer::initGhFromHostingConnection(CConnection &c)
{
auto gh = new CGameHandler();
auto gh = std::make_shared<CGameHandler>();
StartInfo si;
c >> si; //get start options
@ -366,7 +366,8 @@ CGameHandler * CVCMIServer::initGhFromHostingConnection(CConnection &c)
if(!mapFound && si.mode == StartInfo::NEW_GAME)
{
c << ui8(1); //WRONG!
return nullptr;
gh.reset();
return gh;
}
}
@ -385,14 +386,10 @@ void CVCMIServer::newGame()
c >> clients; //how many clients should be connected
assert(clients == 1); //multi goes now by newPregame, TODO: custom lobbies
CGameHandler *gh = initGhFromHostingConnection(c);
auto gh = initGhFromHostingConnection(c);
auto onExit = vstd::makeScopeGuard([&]()
{
vstd::clear_pointer(gh);
});
gh->run(false);
if(gh)
gh->run(false);
}
void CVCMIServer::newPregame()

2
server/CVCMIServer.h
View File

@ -54,7 +54,7 @@ public:
~CVCMIServer();
void start();
CGameHandler *initGhFromHostingConnection(CConnection &c);
std::shared_ptr<CGameHandler> initGhFromHostingConnection(CConnection &c);
void newGame();
void loadGame();