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

Merge pull request #1020 from vcmi/fix-assert

Browse Source 
Fixed asserts (only for debug build)
This commit is contained in:
Andrii Danylchenko
2022-09-30 08:32:39 +03:00
committed by GitHub
parent dae726b82d 127d7ec40b
commit 2e2ea2fe88
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Terrain.cpp
View File

@@ -194,7 +194,7 @@ void TerrainTypeHandler::initTerrains(const std::vector<std::string> & allConfig
for(size_t i = Terrain::FIRST_REGULAR_TERRAIN; i < Terrain::ORIGINAL_TERRAIN_COUNT; i++)
{
//Make sure that original terrains are loaded
assert(objects(i).id != Terrain::WRONG);
assert(objects[i].id != Terrain::WRONG);
}
recreateTerrainMaps();

2
lib/mapObjects/ObjectTemplate.cpp
View File

@@ -157,7 +157,7 @@ void ObjectTemplate::readTxt(CLegacyConfigParser & parser)
// so these two fields can be interpreted as "strong affinity" and "weak affinity" towards terrains
std::string & terrStr = strings[4]; // allowed terrains, 1 = object can be placed on this terrain
assert(terrStr.size() == Terrain::ROCK - 1); // all terrains but rock
assert(terrStr.size() == Terrain::ROCK); // all terrains but rock - counting from 0
for(TerrainId i = Terrain::FIRST_REGULAR_TERRAIN; i < Terrain::ROCK; i++)
{
if (terrStr[8-i] == '1')

2
lib/rmg/WaterProxy.cpp
View File

@@ -43,7 +43,7 @@ void WaterProxy::process()
for(auto & t : zone.area().getTilesVector())
{
assert(map.isOnMap(t));
assert(map.map().getTile(t).terType == zone.getTerrainType());
assert(map.map().getTile(t).terType->id == zone.getTerrainType());
}
for(auto z : map.getZones())