1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00

Merge CPrivilegedInfoCallback into CGameInfoCallback

This commit is contained in:
Ivan Savenko
2025-05-14 13:39:37 +03:00
parent b37a3dc63c
commit 6f20235d07
96 changed files with 345 additions and 384 deletions

View File

@@ -15,7 +15,7 @@
#include <vcmi/spells/Spell.h>
#include <vstd/RNG.h>
#include "../callback/CPrivilegedInfoCallback.h"
#include "../callback/CGameInfoCallback.h"
#include "../callback/IGameEventCallback.h"
#include "../texts/CGeneralTextHandler.h"
#include "../TerrainHandler.h"
@@ -254,7 +254,7 @@ int CGHeroInstance::movementPointsLimitCached(bool onLand, const TurnInfo * ti)
return ti->getMovePointsLimitWater();
}
CGHeroInstance::CGHeroInstance(CPrivilegedInfoCallback * cb)
CGHeroInstance::CGHeroInstance(CGameInfoCallback * cb)
: CArmedInstance(cb),
CArtifactSet(cb),
tacticFormationEnabled(false),