@@ -710,6 +710,8 @@ void CServerHandler::endGameplay(bool closeConnection, bool restart)
if(c)
{
+ nextClient = std::make_unique<CClient>();
+ c->iser.cb = nextClient.get();
c->enterLobbyConnectionMode();
c->disableStackSendingByID();
}
@@ -73,7 +73,7 @@ protected:
ArtifactInstanceID id;
public:
- const CArtifact * artType;
+ const CArtifact * artType = nullptr;
CArtifactInstance(const CArtifact * art);
CArtifactInstance();
@@ -772,7 +772,7 @@ void CGArtifact::initObj(CRandomGenerator & rand)
subID = 1;
assert(storedArtifact->artType);
- assert(storedArtifact->getParentNodes().size());
+ assert(!storedArtifact->getParentNodes().empty());
//assert(storedArtifact->artType->id == subID); //this does not stop desync