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

Map objects now use shared_ptr (game)

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-13 19:42:18 +00:00
parent 2ca1748e96
commit 0ada2a5ebd
49 changed files with 487 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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[left.getNum()], GAME->map().getMap()->objects[right.getNum()]);
return GAME->map().compareObjectBlitOrder(GAME->map().getMap()->objects.at(left.getNum()).get(), GAME->map().getMap()->objects.at(right.getNum()).get());
}
MapRendererContextState::MapRendererContextState()
@ -36,7 +36,7 @@ MapRendererContextState::MapRendererContextState()
logGlobal->debug("Loading map objects");
for(const auto & obj : GAME->map().getMap()->objects)
addObject(obj);
addObject(obj.get());
logGlobal->debug("Done loading map objects");
}