Changeset 6773 for code/branches/gamestates3/data/lua

Timestamp:

Apr 23, 2010, 11:41:30 AM (14 years ago)

Author:

rgrieder

Message:

Eliminated all unnecessary global Lua variables and replaced them either with a local or a instance variable (P.myVar).

File:

• code/branches/gamestates3/data/lua/LuaStateInit.lua (modified) (8 diffs)

code/branches/gamestates3/data/lua/LuaStateInit.lua

@@ -1 @@
--- Note: luaState is a pointer to the LuaState instance that created this lua state
+-- LuaStateInit.lua
+
+-- Note: 'luaState' is a pointer to the LuaState instance that created this lua state
 
 -- Redirect print to the C++ print function
 original_print = print
-print = function(s)
+function print(s)
   luaState:luaPrint(s)
 end
 
 -- Create function to log text like COUT, but always prints a line!
-logMessage = function(level, message)
+function logMessage(level, message)
   luaState:luaLog(level, message)
 end
@@ -15 +17 @@
 -- Redirect dofile in order to load with the resource manager
 original_dofile = dofile
-dofile = function(filename)
+function dofile(filename)
   if not luaState:doFile(filename) then
     error("Error propagation. Do not display")
@@ -26 +28 @@
 -- Create includeFile function that preparses the file according
 -- to a function provided to the LuaState constructor (in C++)
-include = function(filename)
+function include(filename)
   if not luaState:includeFile(filename) then
     error("Error propagation. Do not display")
@@ -37 +39 @@
 -- The loaded modules are then stored with their names (where name has no .lua extension)
 -- Furthermore the ".lua" extension is appended to the moduleName parameter when looking for the file
+_LOADED = {}
+_LOADED_RETURN_VALUES = {}
+_REQUIREDNAME = nil
 original_require = require
-_REQUIREDNAME = ""
-LuaStateReturnValue = true
-require = function(moduleName)
+function require(moduleName)
   if not luaState:fileExists(moduleName .. ".lua") then
     logMessage(2, "Warning: Lua function require() could not find file '" .. moduleName .. ".lua' ")
     return nil
-  end
-
-  if not _LOADED then
-    _LOADED = {}
-  end
-  if not _LOADED_RETURN_VALUES then
-      _LOADED_RETURN_VALUES = {}
   end
 
@@ -69 +65 @@
     _REQUIREDNAME = _REQUIREDNAME_OLD
   end
-  local asdf = _LOADED_RETURN_VALUES[moduleName]
-  return asdf
+  return _LOADED_RETURN_VALUES[moduleName]
 end
-
 
 -- Load useful tool functions (like handleDefaultArgument)
 require("Tools")
-
 
 -- Include command line debugger for lua 5.1
@@ -84 +77 @@
 else
   -- Fallback pause function
-  pause = function()
+  function pause()
     logMessage(2, [["Warning: debug() called in Lua, but Debugger is not active.
 Do you have the IOConsole disabled and are you using Lua version 5.1?"]])
@@ -91 +84 @@
 
 -- General error handler that gets called whenever an error happens at runtime
-errorHandler = function(err)
+function errorHandler(err)
   if type(err) == "string" then
     -- Simply return if the error has already been handled
@@ -112 +105 @@
 end
 
-
 -- Convenience function for console commands
 orxonox.execute = function(command)