From ced374410c522e950d81e48a071606eefccb6176 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 5 Jan 2012 20:01:22 +0000 Subject: [PATCH] - added GAE compatible stubs for a few new lua methods --- source/glest_game/game/script_manager.cpp | 8 ++++++++ source/glest_game/game/script_manager.h | 1 + 2 files changed, 9 insertions(+) diff --git a/source/glest_game/game/script_manager.cpp b/source/glest_game/game/script_manager.cpp index 3dd32f599..b70815335 100644 --- a/source/glest_game/game/script_manager.cpp +++ b/source/glest_game/game/script_manager.cpp @@ -176,7 +176,9 @@ void ScriptManager::init(World* world, GameCamera *gameCamera){ luaScript.registerFunction(getGameWon, "gameWon"); luaScript.registerFunction(getSystemMacroValue, "getSystemMacroValue"); + luaScript.registerFunction(scenarioDir, "scenarioDir"); luaScript.registerFunction(getPlayerName, "getPlayerName"); + luaScript.registerFunction(getPlayerName, "playerName"); luaScript.registerFunction(loadScenario, "loadScenario"); @@ -1491,6 +1493,12 @@ int ScriptManager::getSystemMacroValue(LuaHandle* luaHandle) { return luaArguments.getReturnCount(); } +int ScriptManager::scenarioDir(LuaHandle* luaHandle) { + LuaArguments luaArguments(luaHandle); + luaArguments.returnString(thisScriptManager->getSystemMacroValue("$SCENARIO_PATH")); + return luaArguments.getReturnCount(); +} + int ScriptManager::getPlayerName(LuaHandle* luaHandle) { LuaArguments luaArguments(luaHandle); luaArguments.returnString(thisScriptManager->getPlayerName(luaArguments.getInt(-1))); diff --git a/source/glest_game/game/script_manager.h b/source/glest_game/game/script_manager.h index ce5e39199..1ce6a29d0 100644 --- a/source/glest_game/game/script_manager.h +++ b/source/glest_game/game/script_manager.h @@ -361,6 +361,7 @@ private: static int getSystemMacroValue(LuaHandle* luaHandle); static int getPlayerName(LuaHandle* luaHandle); + static int scenarioDir(LuaHandle* luaHandle); static int loadScenario(LuaHandle* luaHandle); };