浏览代码

Stabilization

Ivan Savenko 1 年之前
父节点
当前提交
496c13b34a
共有 3 个文件被更改,包括 4 次插入2 次删除
  1. 2 0
      client/CServerHandler.cpp
  2. 1 1
      lib/CArtifactInstance.h
  3. 1 1
      lib/mapObjects/MiscObjects.cpp

+ 2 - 0
client/CServerHandler.cpp

@@ -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();
 	}

+ 1 - 1
lib/CArtifactInstance.h

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

+ 1 - 1
lib/mapObjects/MiscObjects.cpp

@@ -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
 }