mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-15 00:05:02 +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:
@ -12,10 +12,6 @@
|
||||
|
||||
#include "ERMInterpreter.h"
|
||||
|
||||
IGameEventRealizer *acb;
|
||||
CPrivilegedInfoCallback *icb;
|
||||
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define strcpy_s(a, b, c) strncpy(a, c, b)
|
||||
#endif
|
||||
@ -27,7 +23,46 @@ extern "C" DLL_EXPORT void GetAiName(char* name)
|
||||
strcpy_s(name, strlen(g_cszAiName) + 1, g_cszAiName);
|
||||
}
|
||||
|
||||
extern "C" DLL_EXPORT void GetNewModule(std::shared_ptr<CScriptingModule> &out)
|
||||
extern "C" DLL_EXPORT void GetNewModule(std::shared_ptr<scripting::Module> &out)
|
||||
{
|
||||
out = std::make_shared<ERMInterpreter>();
|
||||
out = std::make_shared<ERMScriptModule>();
|
||||
}
|
||||
|
||||
ERMScriptModule::ERMScriptModule()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
std::string ERMScriptModule::compile(const std::string & name, const std::string & source, vstd::CLoggerBase * logger) const
|
||||
{
|
||||
std::shared_ptr<ERMInterpreter> interp = std::make_shared<ERMInterpreter>(logger);
|
||||
|
||||
try
|
||||
{
|
||||
return interp->loadScript(name, source);
|
||||
}
|
||||
catch(const std::exception & ex)
|
||||
{
|
||||
logger->error(ex.what());
|
||||
}
|
||||
catch(const std::string & ex)
|
||||
{
|
||||
logger->error(ex);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
logger->error("Sorry, caught unknown exception type. No more info available.");
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
std::shared_ptr<scripting::ContextBase> ERMScriptModule::createContextFor(const scripting::Script * source, const Environment * env) const
|
||||
{
|
||||
throw std::runtime_error("ERM context creation is not possible");
|
||||
}
|
||||
|
||||
void ERMScriptModule::registerSpellEffect(spells::effects::Registry * registry, const scripting::Script * source) const
|
||||
{
|
||||
throw std::runtime_error("ERM spell effect registration is not possible");
|
||||
}
|
||||
|
Reference in New Issue
Block a user