ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on scripting console

Browse Source
This commit is contained in:
Marianne Gagnon
2015-05-17 20:03:53 -04:00
parent 080936f144
commit db4c6f4799
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/scriptengine/script_engine.cpp
View File

@@ -120,24 +120,16 @@ namespace Scripting
{
script_fragment = "void evalScript_main() { \n" + script_fragment + "\n}";
asIScriptModule* mod = m_engine->GetModule(MODULE_ID_EVAL, asGM_ALWAYS_CREATE);
int r = mod->AddScriptSection("script", &script_fragment[0], script_fragment.size());
asIScriptModule* mod = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE, asGM_ONLY_IF_EXISTS);
asIScriptFunction* func;
int r = mod->CompileFunction("eval", script_fragment.c_str(), 0, 0, &func);
if (r < 0)
{
Log::error("Scripting", "evalScript: AddScriptSection() failed");
Log::error("Scripting", "evalScript: CompileFunction() failed");
return;
}
r = mod->Build();
if (r < 0)
{
Log::error("Scripting", "evalScript: Build() failed");
return;
}
asIScriptFunction* func = m_engine->GetModule(MODULE_ID_EVAL)
->GetFunctionByDecl("void evalScript_main()");
asIScriptContext *ctx = m_engine->CreateContext();
if (ctx == NULL)
{
@@ -174,6 +166,7 @@ namespace Scripting
}
ctx->Release();
func->Release();
}
//-----------------------------------------------------------------------------