Changeset 6623

Timestamp:

Mar 27, 2010, 5:48:34 PM (14 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)

Location:

code/branches/gamestate/data

Files:

• gui/scripts/GameplayMenu.lua (modified) (1 diff)
• gui/scripts/GraphicsMenu.lua (modified) (2 diffs)
• gui/scripts/SettingsMenu.lua (modified) (1 diff)
• lua/LuaStateInit.lua (modified) (3 diffs)

code/branches/gamestate/data/gui/scripts/GameplayMenu.lua

@@ -18 +18 @@
 function P.GameplayThemeCombobox_changed(e)
     -- theme
-    debug("event: theme")
+    logMessage(0, "event: theme")
 end
 
 function P.GameplayDifficultyEasyButton_clicked(e)
     -- difficulty easy
-    debug("event: easy")
+    logMessage(0, "event: easy")
 end
 
 function P.GameplayDifficultyNormalButton_clicked(e)
     -- difficulty normal
-    debug("event: normal")
+    logMessage(0, "event: normal")
 end
 
 function P.GameplayDifficultyHardButton_clicked(e)
     -- difficulty hard
-    debug("event: hard")
+    logMessage(0, "event: hard")
 end
 

code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua

@@ -143 +143 @@
     if scrollbar_active == false then
         -- brightness
-        debug("event: brightness")
+        logMessage(0, "event: brightness")
     end
 end
@@ -153 +153 @@
 function P.GraphicsBrightnessScrollbar_ended(e)
     -- brightness
-    debug("event: brightness")
+    logMessage(0, "event: brightness")
     scrollbar_active = false
 end

code/branches/gamestate/data/gui/scripts/SettingsMenu.lua

@@ -25 +25 @@
 function P.SettingsResetSettingsButton_clicked(e)
     -- reset settings
-    debug("event: reset settings")
+    logMessage(0, "event: reset settings")
 end
 

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