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

Stabilization

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-16 17:45:43 +02:00
parent 9af7c63a26
commit 496c13b34a
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CServerHandler.cpp
View File

@@ -710,6 +710,8 @@ void CServerHandler::endGameplay(bool closeConnection, bool restart)
if(c) if(c)
{ {
nextClient = std::make_unique<CClient>();
c->iser.cb = nextClient.get();
c->enterLobbyConnectionMode(); c->enterLobbyConnectionMode();
c->disableStackSendingByID(); c->disableStackSendingByID();
} }

2
lib/CArtifactInstance.h
View File

@@ -73,7 +73,7 @@ protected:
ArtifactInstanceID id; ArtifactInstanceID id;
public: public:
const CArtifact * artType; const CArtifact * artType = nullptr;
CArtifactInstance(const CArtifact * art); CArtifactInstance(const CArtifact * art);
CArtifactInstance(); CArtifactInstance();

2
lib/mapObjects/MiscObjects.cpp
View File

@@ -772,7 +772,7 @@ void CGArtifact::initObj(CRandomGenerator & rand)
subID = 1; subID = 1;
assert(storedArtifact->artType); assert(storedArtifact->artType);
assert(storedArtifact->getParentNodes().size()); assert(!storedArtifact->getParentNodes().empty());
//assert(storedArtifact->artType->id == subID); //this does not stop desync //assert(storedArtifact->artType->id == subID); //this does not stop desync
} }