Explorar el Código

Don't export LuaScript to Lua API, make SetExecuteConsoleCommands GetExecuteConsoleCommands as global functions.

aster2013 hace 11 años
padre
commit
058347b555

+ 5 - 19
Source/Engine/LuaScript/pkgs/LuaScript/LuaScript.pkg

@@ -1,13 +1,5 @@
 $#include "LuaScript.h"
 
-class LuaScript
-{
-    void SetExecuteConsoleCommands(bool enable);
-    bool GetExecuteConsoleCommands();
-    
-    tolua_property__get_set bool executeConsoleCommands;
-}
-
 void LuaScriptSendEvent @ SendEvent(const String eventName, VariantMap& eventData);
 void LuaScriptSubscribeToEvent @ SubscribeToEvent(const String eventName, const String functionName);
 void LuaScriptUnsubscribeFromEvent @ UnsubscribeFromEvent(const String eventName, const String functionName = String::EMPTY);
@@ -16,19 +8,10 @@ void LuaScriptSubscribeToEvent @ SubscribeToEvent(void* sender, const String eve
 void LuaScriptUnsubscribeFromEvent @ UnsubscribeFromEvent(void* sender, const String eventName, const String functionName = String::EMPTY);
 void LuaScriptUnsubscribeFromEvents @ UnsubscribeFromEvents(void* sender);
 
-LuaScript* GetLuaScript();
-tolua_readonly tolua_property__get_set LuaScript* luaScript;
+void LuaScriptSetExecuteConsoleCommands @ SetExecuteConsoleCommands(bool enable);
+bool LuaScriptGetExecuteConsoleCommands @ GetExecuteConsoleCommands();
 
 ${
-#define TOLUA_DISABLE_tolua_LuaScriptLuaAPI_GetLuaScript00
-static int tolua_LuaScriptLuaAPI_GetLuaScript00(lua_State* tolua_S)
-{
-    return ToluaGetSubsystem<LuaScript>(tolua_S);
-}
-
-#define TOLUA_DISABLE_tolua_get_luaScript_ptr
-#define tolua_get_luaScript_ptr tolua_LuaScriptLuaAPI_GetLuaScript00
-
 static LuaScript* GetLuaScript(lua_State* L)
 {
     return GetContext(L)->GetSubsystem<LuaScript>();
@@ -39,4 +22,7 @@ static LuaScript* GetLuaScript(lua_State* L)
 #define LuaScriptUnsubscribeFromEvent GetLuaScript(tolua_S)->ScriptUnsubscribeFromEvent
 #define LuaScriptUnsubscribeFromAllEvents GetLuaScript(tolua_S)->ScriptUnsubscribeFromAllEvents
 #define LuaScriptUnsubscribeFromEvents GetLuaScript(tolua_S)->ScriptUnsubscribeFromEvents
+
+#define LuaScriptSetExecuteConsoleCommands GetLuaScript(tolua_S)->SetExecuteConsoleCommands
+#define LuaScriptGetExecuteConsoleCommands GetLuaScript(tolua_S)->GetExecuteConsoleCommands
 $}

+ 1 - 1
bin/Data/LuaScripts/26_ConsoleInput.lua

@@ -52,7 +52,7 @@ function Start()
     input.mouseVisible = true
 
     -- Disable default execution of Lua from the console
-    luaScript.executeConsoleCommands = false
+    SetExecuteConsoleCommands(false)
 
     -- Open the operating system console window (for stdin / stdout) if not open yet
     OpenConsoleWindow()