mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-15 01:24:45 +02:00
TerrainTile now uses identifiers instead of pointers to VLC
This commit is contained in:
@ -51,7 +51,7 @@ void WaterProxy::process()
|
||||
for([[maybe_unused]] const auto & t : area->getTilesVector())
|
||||
{
|
||||
assert(map.isOnMap(t));
|
||||
assert(map.getTile(t).terType->getId() == zone.getTerrainType());
|
||||
assert(map.getTile(t).getTerrainID() == zone.getTerrainType());
|
||||
}
|
||||
|
||||
// FIXME: Possible deadlock for 2 zones
|
||||
@ -66,7 +66,7 @@ void WaterProxy::process()
|
||||
auto secondAreaPossible = z.second->areaPossible();
|
||||
for(const auto & t : secondArea->getTilesVector())
|
||||
{
|
||||
if(map.getTile(t).terType->getId() == zone.getTerrainType())
|
||||
if(map.getTile(t).getTerrainID() == zone.getTerrainType())
|
||||
{
|
||||
secondArea->erase(t);
|
||||
secondAreaPossible->erase(t);
|
||||
|
Reference in New Issue
Block a user