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

Entities redesign and a few ERM features

Browse Source 
* 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:
AlexVinS
2018-03-17 17:58:30 +03:00
committed by AlexVinS
parent 11bb46780a
commit ecaa9f5d0b
475 changed files with 22491 additions and 7123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/VCMI_Lib.h
View File

@@ -9,6 +9,8 @@
*/
#pragma once
#include <vcmi/Services.h>
class CConsoleHandler;
class CArtHandler;
class CHeroHandler;
@@ -26,9 +28,15 @@ class IBonusTypeHandler;
class CBonusTypeHandler;
class CTerrainViewPatternConfig;
class CRmgTemplateStorage;
class IHandlerBase;
namespace scripting
{
class ScriptHandler;
}
/// Loads and constructs several handlers
class DLL_LINKAGE LibClasses
class DLL_LINKAGE LibClasses : public Services
{
CBonusTypeHandler * bth;
@@ -41,7 +49,21 @@ class DLL_LINKAGE LibClasses
public:
bool IS_AI_ENABLED; //unused?
const IBonusTypeHandler * getBth() const;
const ArtifactService * artifacts() const override;
const CreatureService * creatures() const override;
const FactionService * factions() const override;
const HeroClassService * heroClasses() const override;
const HeroTypeService * heroTypes() const override;
const scripting::Service * scripts() const override;
const spells::Service * spells() const override;
const SkillService * skills() const override;
void updateEntity(Metatype metatype, int32_t index, const JsonNode & data) override;
const spells::effects::Registry * spellEffects() const override;
spells::effects::Registry * spellEffects() override;
const IBonusTypeHandler * getBth() const; //deprecated
CArtHandler * arth;
CHeroHandler * heroh;
@@ -55,6 +77,7 @@ public:
CModHandler * modh;
CTerrainViewPatternConfig * terviewh;
CRmgTemplateStorage * tplh;
scripting::ScriptHandler * scriptHandler;
LibClasses(); //c-tor, loads .lods and NULLs handlers
~LibClasses();
@@ -64,9 +87,23 @@ public:
void loadFilesystem(bool onlyEssential);// basic initialization. should be called before init()
void scriptsLoaded();
template <typename Handler> void serialize(Handler &h, const int version)
{
if(version >= 800)
{
h & scriptHandler;//must be first (or second after modh), it can modify factories other handlers depends on
if(!h.saving)
{
scriptsLoaded();
}
}
else if(!h.saving)
{
update800();
}
h & heroh;
h & arth;
h & creh;
@@ -93,11 +130,15 @@ public:
h & IS_AI_ENABLED;
h & bth;
if(!h.saving)
{
callWhenDeserializing();
}
}
private:
void update800();
};
extern DLL_LINKAGE LibClasses * VLC;