Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When calling script hooks from another script, re-use existing script context.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-02-08 09:39:36 +01:00
parent b8b692d4d6
commit af2f62a278
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ScriptResolving/AngelScript/AngelScriptScript.hpp
View File

@ -33,7 +33,14 @@ public:
auto s = _type->Get##name(); \ auto s = _type->Get##name(); \
if (!s.Exists) \ if (!s.Exists) \
return; \ return; \
auto ctx = _ctxPool->RequestContext(); \ auto ctx = asGetActiveContext(); \
bool newContext = false; \
if (ctx == nullptr) { \
ctx = _ctxPool->RequestContext(); \
newContext = true; \
} else { \
ctx->PushState(); \
} \
ctx->Prepare(s.Function); \ ctx->Prepare(s.Function); \
ctx->SetObject(_obj); \ ctx->SetObject(_obj); \
setup; \ setup; \
@ -41,11 +48,15 @@ public:
if (scriptResult != 0) { \ if (scriptResult != 0) { \
throw CreatureException("Script didn't finish properly; message " + std::to_string(scriptResult)); \ throw CreatureException("Script didn't finish properly; message " + std::to_string(scriptResult)); \
} \ } \
_ctxPool->ReturnContextToPool(ctx); if (newContext) { \
_ctxPool->ReturnContextToPool(ctx); \
} else { \
ctx->PopState(); \
}
void Stack() override { CALLHOOK(Stack,); } void Stack() override { CALLHOOK(Stack, ); }
void OnRemove() override { CALLHOOK(OnRemove,); } void OnRemove() override { CALLHOOK(OnRemove, ); }
void OnBeforeTurn(const CreatureLib::Battling::BaseTurnChoice* choice) override { void OnBeforeTurn(const CreatureLib::Battling::BaseTurnChoice* choice) override {
throw NotImplementedException(); // TODO throw NotImplementedException(); // TODO