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

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

88
lib/IHandlerBase.h
View File

@@ -9,18 +9,15 @@
*/
#pragma once
#include "../lib/ConstTransitivePtr.h"
#include "VCMI_Lib.h"
#include "../lib/ConstTransitivePtr.h"
#include "VCMI_Lib.h"
class JsonNode;
class Entity;
/// base class for all handlers that can be accessed from mod system
class DLL_LINKAGE IHandlerBase
{
// there also should be private member with such signature:
// Object * loadFromJson(const JsonNode & json);
// where Object is type of data loaded by handler
// primary used in loadObject methods
protected:
/// Calls modhandler. Mostly needed to avoid large number of includes in headers
void registerObject(std::string scope, std::string type_name, std::string name, si32 index);
@@ -54,7 +51,7 @@ public:
virtual ~IHandlerBase(){}
};
template <class _ObjectID, class _Object> class CHandlerBase: public IHandlerBase
template <class _ObjectID, class _ObjectBase, class _Object, class _ServiceBase> class CHandlerBase : public _ServiceBase, public IHandlerBase
{
public:
virtual ~CHandlerBase()
@@ -65,45 +62,104 @@ public:
}
}
const Entity * getBaseByIndex(const int32_t index) const override
{
return getByIndex(index);
}
const _ObjectBase * getById(const _ObjectID & id) const override
{
return (*this)[id].get();
}
const _ObjectBase * getByIndex(const int32_t index) const override
{
return (*this)[_ObjectID(index)].get();
}
void forEachBase(const std::function<void(const Entity * entity, bool & stop)> & cb) const override
{
forEachT(cb);
}
void forEach(const std::function<void(const _ObjectBase * entity, bool & stop)> & cb) const override
{
forEachT(cb);
}
void loadObject(std::string scope, std::string name, const JsonNode & data) override
{
auto object = loadFromJson(data, normalizeIdentifier(scope, "core", name), objects.size());
auto object = loadFromJson(scope, data, normalizeIdentifier(scope, "core", name), objects.size());
objects.push_back(object);
for(auto type_name : getTypeNames())
registerObject(scope, type_name, name, object->id);
registerObject(scope, type_name, name, object->getIndex());
}
void loadObject(std::string scope, std::string name, const JsonNode & data, size_t index) override
{
auto object = loadFromJson(data, normalizeIdentifier(scope, "core", name), index);
auto object = loadFromJson(scope, data, normalizeIdentifier(scope, "core", name), index);
assert(objects[index] == nullptr); // ensure that this id was not loaded before
objects[index] = object;
for(auto type_name : getTypeNames())
registerObject(scope, type_name, name, object->id);
registerObject(scope, type_name, name, object->getIndex());
}
ConstTransitivePtr<_Object> operator[] (const _ObjectID id) const
{
const auto raw_id = id.toEnum();
const int32_t raw_id = id.getNum();
return operator[](raw_id);
}
if (raw_id < 0 || raw_id >= objects.size())
ConstTransitivePtr<_Object> operator[] (int32_t index) const
{
if(index < 0 || index >= objects.size())
{
logMod->error("%s id %d is invalid", getTypeNames()[0], static_cast<si64>(raw_id));
logMod->error("%s id %d is invalid", getTypeNames()[0], index);
throw std::runtime_error("internal error");
}
return objects[raw_id];
return objects[index];
}
void updateEntity(int32_t index, const JsonNode & data)
{
if(index < 0 || index >= objects.size())
{
logMod->error("%s id %d is invalid", getTypeNames()[0], index);
}
else
{
objects.at(index)->updateFrom(data);
}
}
size_t size() const
{
return objects.size();
}
protected:
virtual _Object * loadFromJson(const JsonNode & json, const std::string & identifier, size_t index) = 0;
virtual _Object * loadFromJson(const std::string & scope, const JsonNode & json, const std::string & identifier, size_t index) = 0;
virtual const std::vector<std::string> & getTypeNames() const = 0;
template<typename ItemType>
void forEachT(const std::function<void(const ItemType *, bool &)> & cb) const
{
bool stop = false;
for(auto & object : objects)
{
cb(object.get(), stop);
if(stop)
break;
}
}
public: //todo: make private
std::vector<ConstTransitivePtr<_Object>> objects;
};