Browse Source

Fix crash on initializing off-map hero

Ivan Savenko 6 months ago
parent
commit
83099f9288
1 changed files with 4 additions and 1 deletions
  1. 4 1
      lib/mapObjects/CArmedInstance.cpp

+ 4 - 1
lib/mapObjects/CArmedInstance.cpp

@@ -166,7 +166,10 @@ void CArmedInstance::serializeJsonOptions(JsonSerializeFormat & handler)
 
 TerrainId CArmedInstance::getCurrentTerrain() const
 {
-	return cb->getTile(anchorPos())->getTerrainID();
+	if (anchorPos().isValid())
+		return cb->getTile(visitablePos())->getTerrainID();
+	else
+		return TerrainId::NONE;
 }
 
 VCMI_LIB_NAMESPACE_END