games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-24 00:36:29 +02:00
Code Issues Releases Activity

Store TerrainType by havlue and handle by reference

Browse Source
This commit is contained in:
Tomasz Zieliński
2022-09-26 09:17:55 +02:00
parent cd3a1a02c2
commit 2bd30556a3
20 changed files with 162 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mapObjects/ObjectTemplate.cpp
View File

@@ -165,10 +165,10 @@ void ObjectTemplate::readTxt(CLegacyConfigParser & parser)
//assuming that object can be placed on other land terrains
if(allowedTerrains.size() >= 8 && !allowedTerrains.count(Terrain::WATER))
{
for(const auto * terrain : VLC->terrainTypeHandler->terrains())
for(const auto & terrain : VLC->terrainTypeHandler->terrains())
{
if(terrain->isLand() && terrain->isPassable())
allowedTerrains.insert(terrain->id);
if(terrain.isLand() && terrain.isPassable())
allowedTerrains.insert(terrain.id);
}
}
@@ -238,10 +238,10 @@ void ObjectTemplate::readMap(CBinaryReader & reader)
//assuming that object can be placed on other land terrains
if(allowedTerrains.size() >= 8 && !allowedTerrains.count(Terrain::WATER))
{
for(const auto * terrain : VLC->terrainTypeHandler->terrains())
for(const auto & terrain : VLC->terrainTypeHandler->terrains())
{
if(terrain->isLand() && terrain->isPassable())
allowedTerrains.insert(terrain->id);
if(terrain.isLand() && terrain.isPassable())
allowedTerrains.insert(terrain.id);
}
}
@@ -289,11 +289,11 @@ void ObjectTemplate::readJson(const JsonNode &node, const bool withTerrain)
}
else
{
for(const auto* terrain : VLC->terrainTypeHandler->terrains())
for(const auto & terrain : VLC->terrainTypeHandler->terrains())
{
if(!terrain->isPassable() || terrain->isWater())
if(!terrain.isPassable() || terrain.isWater())
continue;
allowedTerrains.insert(terrain->id);
allowedTerrains.insert(terrain.id);
}
}