Changeset 6623 for code/branches/gamestate/data/lua

Timestamp:

Mar 27, 2010, 5:48:34 PM (15 years ago)

Author:

rgrieder

Message:

The lua "print" function was previously stored in "debug" —> changed that to "original_print".
Please use logMessage(level, message)
or its shortcut cout(level, message)

File:

• code/branches/gamestate/data/lua/LuaStateInit.lua (modified) (3 diffs)

code/branches/gamestate/data/lua/LuaStateInit.lua

@@ -1 +1 @@
 -- Note: luaState is a pointer to the LuaState instance that created this lua state
 
--- Save original print function in debug
-debug = print
-
 -- Redirect print to the C++ print function
+original_print = print
 print = function(s)
   luaState:luaPrint(s)
@@ -13 +11 @@
   luaState:luaLog(level, message)
 end
+cout = logMessage
 
 -- Redirect dofile in order to load with the resource manager
-doFile = function(filename)
+original_dofile = dofile
+dofile = function(filename)
   luaState:doFile(filename)
   -- Required because the C++ function cannot return whatever might be on the stack
   return LuaStateReturnValue -- C-injected global variable
 end
-original_dofile = dofile
-dofile = doFile
+doFile = dofile
 
 -- Create includeFile function that preparses the file according
@@ -34 +33 @@
 -- 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
-old_require = require
+original_require = require
 require = function(moduleName)
   if not luaState:fileExists(moduleName .. ".lua") then
+    logMessage(2, "Warning: Lua function require() could not find file '" .. moduleName .. ".lua' ")
     return nil
   end