games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +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

6
client/mapView/MapRendererContextState.cpp
View File

@@ -25,7 +25,7 @@
static bool compareObjectBlitOrder(ObjectInstanceID left, ObjectInstanceID right)
{
//FIXME: remove mh access
return GAME->map().compareObjectBlitOrder(GAME->map().getMap()->objects.at(left.getNum()).get(), GAME->map().getMap()->objects.at(right.getNum()).get());
return GAME->map().compareObjectBlitOrder(GAME->map().getMap()->getObject(left), GAME->map().getMap()->getObject(right));
}
MapRendererContextState::MapRendererContextState()
@@ -35,8 +35,8 @@ MapRendererContextState::MapRendererContextState()
objects.resize(boost::extents[mapSize.z][mapSize.x][mapSize.y]);
logGlobal->debug("Loading map objects");
for(const auto & obj : GAME->map().getMap()->objects)
addObject(obj.get());
for(const auto & obj : GAME->map().getMap()->getObjects())
addObject(obj);
logGlobal->debug("Done loading map objects");
}