games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Objects list is now private member of CMap

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-15 17:40:10 +00:00
parent 745040def3
commit bdae7285ae
22 changed files with 166 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/map/MapComparer.cpp
View File

@@ -211,14 +211,10 @@ void MapComparer::compareObject(const CGObjectInstance * actual, const CGObjectI
void MapComparer::compareObjects()
{
EXPECT_EQ(actual->objects.size(), expected->objects.size());
EXPECT_EQ(actual->getObjects().size(), expected->getObjects().size());
for(size_t idx = 0; idx < expected->objects.size(); idx++)
for(const auto & expectedObject : expected->getObjects())
{
auto expectedObject = expected->objects[idx];
ASSERT_EQ(idx, expectedObject->id.getNum());
{
auto it = expected->instanceNames.find(expectedObject->instanceName);
@@ -232,7 +228,7 @@ void MapComparer::compareObjects()
auto actualObject = it->second;
compareObject(actualObject.get(), expectedObject.get());
compareObject(actualObject.get(), expectedObject);
}
}
}