reaname and cleanup many stuff

modules/game/game.lua

@@ -8,7 +8,7 @@ local function onGameKeyPress(self, keyCode, keyboardModifiers)
       CharacterList.show()
       return true
     elseif keyCode == KeyQ then
-      Game.safeLogout()
+      g_game.safeLogout()
       return true
     end
   end
@@ -16,97 +16,97 @@ local function onGameKeyPress(self, keyCode, keyboardModifiers)
 end
 
 local function onUseWithMouseRelease(self, mousePosition, mouseButton)
-  if Game.selectedThing == nil then return false end
+  if g_game.selectedThing == nil then return false end
   if mouseButton == MouseLeftButton then
-    local clickedWidget = Game.gameUi:recursiveGetChildByPos(mousePosition)
+    local clickedWidget = g_game.gameUi:recursiveGetChildByPos(mousePosition)
     if clickedWidget then
       if clickedWidget:getClassName() == 'UIMap' then
         local tile = clickedWidget:getTile(mousePosition)
         if tile then
-          Game.useWith(Game.selectedThing, tile:getTopMultiUseThing())
+          g_game.useWith(g_game.selectedThing, tile:getTopMultiUseThing())
         end
       elseif clickedWidget:getClassName() == 'UIItem' and not clickedWidget:isVirtual() then
-        Game.useWith(Game.selectedThing, clickedWidget:getItem())
+        g_game.useWith(g_game.selectedThing, clickedWidget:getItem())
       end
     end
   end
-  Game.selectedThing = nil
+  g_game.selectedThing = nil
   Mouse.restoreCursor()
   self:ungrabMouse()
   return true
 end
 
 -- public functions
-function Game.startUseWith(thing)
-  Game.selectedThing = thing
+function g_game.startUseWith(thing)
+  g_game.selectedThing = thing
   m_mouseGrabberWidget:grabMouse()
   Mouse.setTargetCursor()
 end
 
-function Game.createInterface()
+function g_game.createInterface()
   Background.hide()
   CharacterList.destroyLoadBox()
-  Game.gameUi = displayUI('game.otui')
+  g_game.gameUi = displayUI('game.otui')
 
-  --Keyboard.bindKeyPress('Up', function() Game.walk(North) end)
-  --Keyboard.bindKeyPress('Down', function() Game.walk(South) end)
-  --Keyboard.bindKeyPress('Left', function() Game.walk(West) end)
-  --Keyboard.bindKeyPress('Right', function() Game.walk(East) end)
+  --Keyboard.bindKeyPress('Up', function() g_game.walk(North) end)
+  --Keyboard.bindKeyPress('Down', function() g_game.walk(South) end)
+  --Keyboard.bindKeyPress('Left', function() g_game.walk(West) end)
+  --Keyboard.bindKeyPress('Right', function() g_game.walk(East) end)
 
-  Keyboard.bindKeyPress('Ctrl+Shift+Up', function() Game.forceWalk(North) end)
-  Keyboard.bindKeyPress('Ctrl+Shift+Down', function() Game.forceWalk(South) end)
-  Keyboard.bindKeyPress('Ctrl+Shift+Left', function() Game.forceWalk(West) end)
-  Keyboard.bindKeyPress('Ctrl+Shift+Right', function() Game.forceWalk(East) end)
+  Keyboard.bindKeyPress('Ctrl+Shift+Up', function() g_game.forceWalk(North) end)
+  Keyboard.bindKeyPress('Ctrl+Shift+Down', function() g_game.forceWalk(South) end)
+  Keyboard.bindKeyPress('Ctrl+Shift+Left', function() g_game.forceWalk(West) end)
+  Keyboard.bindKeyPress('Ctrl+Shift+Right', function() g_game.forceWalk(East) end)
 
-  rootWidget:moveChildToIndex(Game.gameUi, 1)
-  Game.gameMapPanel = Game.gameUi:getChildById('gameMapPanel')
-  Game.gameRightPanel = Game.gameUi:getChildById('gameRightPanel')
-  Game.gameBottomPanel = Game.gameUi:getChildById('gameBottomPanel')
-  m_mouseGrabberWidget = Game.gameUi:getChildById('mouseGrabber')
-  connect(Game.gameUi, { onKeyPress = onGameKeyPress })
+  rootWidget:moveChildToIndex(g_game.gameUi, 1)
+  g_game.gameMapPanel = g_game.gameUi:getChildById('gameMapPanel')
+  g_game.gameRightPanel = g_game.gameUi:getChildById('gameRightPanel')
+  g_game.gameBottomPanel = g_game.gameUi:getChildById('gameBottomPanel')
+  m_mouseGrabberWidget = g_game.gameUi:getChildById('mouseGrabber')
+  connect(g_game.gameUi, { onKeyPress = onGameKeyPress })
   connect(m_mouseGrabberWidget, { onMouseRelease = onUseWithMouseRelease })
 end
 
-function Game.destroyInterface()
-  if Game.gameUi then
-    Game.gameUi:destroy()
-    Game.gameUi = nil
+function g_game.destroyInterface()
+  if g_game.gameUi then
+    g_game.gameUi:destroy()
+    g_game.gameUi = nil
   end
   Background.show()
   CharacterList.show()
 end
 
-function Game.show()
-  Game.gameUi:show()
-  Game.gameUi:focus()
-  Game.gameMapPanel:focus()
+function g_game.show()
+  g_game.gameUi:show()
+  g_game.gameUi:focus()
+  g_game.gameMapPanel:focus()
 end
 
-function Game.hide()
-  Game.gameUi:hide()
+function g_game.hide()
+  g_game.gameUi:hide()
 end
 
 -- hooked events
-function Game.onLoginError(message)
+function g_game.onLoginError(message)
   CharacterList.destroyLoadBox()
   local errorBox = displayErrorBox("Login Error", "Login error: " .. message)
   connect(errorBox, { onOk = CharacterList.show })
 end
 
-function Game.onConnectionError(message)
+function g_game.onConnectionError(message)
   CharacterList.destroyLoadBox()
   local errorBox = displayErrorBox("Login Error", "Connection error: " .. message)
   connect(errorBox, { onOk = CharacterList.show })
 end
 
 local function onApplicationClose()
-  if Game.isOnline() then
-    Game.forceLogout()
+  if g_game.isOnline() then
+    g_game.forceLogout()
   else
     exit()
   end
 end
 
 setonclose(onApplicationClose)
-connect(Game, { onGameStart = Game.createInterface }, true)
-connect(Game, { onGameEnd = Game.destroyInterface })
+connect(g_game, { onGameStart = g_game.createInterface }, true)
+connect(g_game, { onGameEnd = g_game.destroyInterface })