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

Removed CGI in favor of VLC. Map handle is for now global variable

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-10 22:52:48 +00:00
parent f657e85305
commit ffd37a8fa8
106 changed files with 940 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mapView/MapRendererContextState.cpp
View File

@@ -15,7 +15,6 @@
#include "mapHandler.h"
#include "../../CCallback.h"
#include "../CGameInfo.h"
#include "../CPlayerInterface.h"
#include "../adventureMap/AdventureMapInterface.h"
@@ -25,7 +24,7 @@
static bool compareObjectBlitOrder(ObjectInstanceID left, ObjectInstanceID right)
{
//FIXME: remove mh access
return CGI->mh->compareObjectBlitOrder(CGI->mh->getMap()->objects[left.getNum()], CGI->mh->getMap()->objects[right.getNum()]);
return MAPHANDLER->compareObjectBlitOrder(MAPHANDLER->getMap()->objects[left.getNum()], MAPHANDLER->getMap()->objects[right.getNum()]);
}
MapRendererContextState::MapRendererContextState()
@@ -35,7 +34,7 @@ MapRendererContextState::MapRendererContextState()
objects.resize(boost::extents[mapSize.z][mapSize.x][mapSize.y]);
logGlobal->debug("Loading map objects");
for(const auto & obj : CGI->mh->getMap()->objects)
for(const auto & obj : MAPHANDLER->getMap()->objects)
addObject(obj);
logGlobal->debug("Done loading map objects");
}