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

Minor scripting work

Browse Source
This commit is contained in:
Marianne Gagnon
2015-05-20 20:17:00 -04:00
parent e290e9003d
commit 8113ea128b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/scriptengine/script_engine.cpp
View File

@@ -39,7 +39,6 @@ using namespace Scripting;
namespace Scripting
{
const char* MODULE_ID_MAIN_SCRIPT_FILE = "main";
const char* MODULE_ID_EVAL = "eval";
void AngelScript_ErrorCallback (const asSMessageInfo *msg, void *param)
{

6
src/scriptengine/script_utils.cpp
View File

@@ -102,10 +102,8 @@ namespace Scripting
}
/** Runs the script specified by the given string */
// TODO: type arguments
void runScript(asIScriptGeneric *gen)
void runScript(const std::string* str)
{
std::string *str = (std::string*)gen->GetArgAddress(0);
ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
script_engine->runFunction(*str);
}
@@ -163,7 +161,7 @@ namespace Scripting
r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues3), asCALL_CDECL); assert(r >= 0);
r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues4), asCALL_CDECL); assert(r >= 0);
r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_GENERIC); assert(r >= 0);
r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_CDECL); assert(r >= 0);
r = engine->RegisterGlobalFunction("void logInfo(const string &in)", asFUNCTION(logInfo), asCALL_CDECL); assert(r >= 0);
r = engine->RegisterGlobalFunction("void logWarning(const string &in)", asFUNCTION(logWarning), asCALL_CDECL); assert(r >= 0);