games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Build fixes

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-03-27 06:48:22 +01:00
parent 37f6993402
commit 19633a0f62
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/rmg/Zone.h
View File

@@ -54,7 +54,8 @@ public:
return resourceRef + other;
}
T operator+(ThreadSafeProxy<T> & other)
template <typename U>
T operator+(ThreadSafeProxy<U> & other)
{
return get() + other.get();
}

2
lib/rmg/modificators/ObjectManager.cpp
View File

@@ -614,7 +614,7 @@ void ObjectManager::placeObject(rmg::Object & object, bool guarded, bool updateD
}
}
for (auto id : sorted)
for (auto id : adjacentZones)
{
auto otherZone = map.getZones().at(id);
if ((otherZone->getType() == ETemplateZoneType::WATER) == (zone.getType() == ETemplateZoneType::WATER))