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

Make IObjectInterface::cb non-static

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-01 16:37:48 +02:00
parent c37ce05d06
commit a15366f5a5
89 changed files with 502 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mapObjects/MiscObjects.cpp
View File

@ -584,13 +584,13 @@ void CGSubterraneanGate::initObj(CRandomGenerator & rand)
type = BOTH;
}
void CGSubterraneanGate::postInit() //matches subterranean gates into pairs
void CGSubterraneanGate::postInit(IGameCallback * cb) //matches subterranean gates into pairs
{
//split on underground and surface gates
std::vector<CGSubterraneanGate *> gatesSplit[2]; //surface and underground gates
for(auto & obj : cb->gameState()->map->objects)
{
if(!obj) // FIXME: Find out why there are nullptr objects right after initialization
if(!obj)
continue;
auto * hlp = dynamic_cast<CGSubterraneanGate *>(cb->gameState()->getObjInstance(obj->id));
@ -1081,7 +1081,8 @@ void CGMagi::onHeroVisit(const CGHeroInstance * h) const
}
}
CGBoat::CGBoat()
CGBoat::CGBoat(IGameCallback * cb)
: CGObjectInstance(cb)
{
hero = nullptr;
direction = 4;