mirror of
https://github.com/vcmi/vcmi.git
synced 2025-12-03 23:19:22 +02:00
Entities redesign and a few ERM features
* Made most Handlers derived from CHandlerBase and moved service API there. * Declared existing Entity APIs. * Added basic script context caching * Started Lua script module * Started Lua spell effect API * Started script state persistence * Started battle info callback binding * CommitPackage removed * Extracted spells::Caster to own header; Expanded Spell API. * implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C * !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented * Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key) * Re-enabled VERM macros. * !?GM0 added * !?TM implemented * Added !!MF:N * Started !?OB, !!BM, !!HE, !!OW, !!UN * Added basic support of w-variables * Added support for ERM indirect variables * Made !?FU regular trigger * !!re (ERA loop receiver) implemented * Fixed ERM receivers with zero args.
This commit is contained in:
@@ -9,8 +9,6 @@
|
||||
*/
|
||||
#include "StdInc.h"
|
||||
#include "CGameInfo.h"
|
||||
#include "../lib/CSkillHandler.h"
|
||||
#include "../lib/CGeneralTextHandler.h"
|
||||
|
||||
#include "../lib/VCMI_Lib.h"
|
||||
|
||||
@@ -24,13 +22,14 @@ CGameInfo::CGameInfo()
|
||||
generaltexth = nullptr;
|
||||
mh = nullptr;
|
||||
townh = nullptr;
|
||||
globalServices = nullptr;
|
||||
}
|
||||
|
||||
void CGameInfo::setFromLib()
|
||||
{
|
||||
globalServices = VLC;
|
||||
modh = VLC->modh;
|
||||
generaltexth = VLC->generaltexth;
|
||||
arth = VLC->arth;
|
||||
creh = VLC->creh;
|
||||
townh = VLC->townh;
|
||||
heroh = VLC->heroh;
|
||||
@@ -39,3 +38,58 @@ void CGameInfo::setFromLib()
|
||||
skillh = VLC->skillh;
|
||||
objtypeh = VLC->objtypeh;
|
||||
}
|
||||
|
||||
const ArtifactService * CGameInfo::artifacts() const
|
||||
{
|
||||
return globalServices->artifacts();
|
||||
}
|
||||
|
||||
const CreatureService * CGameInfo::creatures() const
|
||||
{
|
||||
return globalServices->creatures();
|
||||
}
|
||||
|
||||
const FactionService * CGameInfo::factions() const
|
||||
{
|
||||
return globalServices->factions();
|
||||
}
|
||||
|
||||
const HeroClassService * CGameInfo::heroClasses() const
|
||||
{
|
||||
return globalServices->heroClasses();
|
||||
}
|
||||
|
||||
const HeroTypeService * CGameInfo::heroTypes() const
|
||||
{
|
||||
return globalServices->heroTypes();
|
||||
}
|
||||
|
||||
const scripting::Service * CGameInfo::scripts() const
|
||||
{
|
||||
return globalServices->scripts();
|
||||
}
|
||||
|
||||
const spells::Service * CGameInfo::spells() const
|
||||
{
|
||||
return globalServices->spells();
|
||||
}
|
||||
|
||||
const SkillService * CGameInfo::skills() const
|
||||
{
|
||||
return globalServices->skills();
|
||||
}
|
||||
|
||||
void CGameInfo::updateEntity(Metatype metatype, int32_t index, const JsonNode & data)
|
||||
{
|
||||
logGlobal->error("CGameInfo::updateEntity call is not expected.");
|
||||
}
|
||||
|
||||
spells::effects::Registry * CGameInfo::spellEffects()
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const spells::effects::Registry * CGameInfo::spellEffects() const
|
||||
{
|
||||
return globalServices->spellEffects();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user