From f444dc624c251e15bf4dc892a62b5f057491ee08 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Thu, 3 Nov 2011 20:16:47 -0200
Subject: [PATCH] fix and move textmessage to a module

---
 modules/game/game.lua                             |  4 +---
 modules/game/{ui/gameinterface.otui => game.otui} |  0
 modules/{game => textmessage}/textmessage.lua     |  6 +++++-
 modules/textmessage/textmessage.otmod             | 13 +++++++++++++
 modules/{game/ui => textmessage}/textmessage.otui |  0
 5 files changed, 19 insertions(+), 4 deletions(-)
 rename modules/game/{ui/gameinterface.otui => game.otui} (100%)
 rename modules/{game => textmessage}/textmessage.lua (93%)
 create mode 100644 modules/textmessage/textmessage.otmod
 rename modules/{game/ui => textmessage}/textmessage.otui (100%)

diff --git a/modules/game/game.lua b/modules/game/game.lua
index af23dc9c..4303bf26 100644
--- a/modules/game/game.lua
+++ b/modules/game/game.lua
@@ -1,5 +1,3 @@
-require 'textmessage'
-
 -- private functions
 local function onGameKeyPress(self, keyCode, keyChar, keyboardModifiers)
   if keyboardModifiers == KeyboardCtrlModifier then
@@ -18,7 +16,7 @@ end
 function Game.createInterface()
   Background.hide()
   CharacterList.destroyLoadBox()
-  Game.gameUi = loadUI('/game/ui/gameinterface.otui', UI.root)
+  Game.gameUi = loadUI('/game/game.otui', UI.root)
   Game.gameMapPanel = Game.gameUi:getChildById('mapPanel')
   Game.gameRightPanel = Game.gameUi:getChildById('rightPanel')
   Game.gameBottomPanel = Game.gameUi:getChildById('bottomPanel')
diff --git a/modules/game/ui/gameinterface.otui b/modules/game/game.otui
similarity index 100%
rename from modules/game/ui/gameinterface.otui
rename to modules/game/game.otui
diff --git a/modules/game/textmessage.lua b/modules/textmessage/textmessage.lua
similarity index 93%
rename from modules/game/textmessage.lua
rename to modules/textmessage/textmessage.lua
index a1fd61f6..3cdf20c6 100644
--- a/modules/game/textmessage.lua
+++ b/modules/textmessage/textmessage.lua
@@ -1,7 +1,7 @@
 TextMessage = {}
 
 -- require styles
-importStyles '/game/ui/textmessage.otui'
+importStyles '/textmessage/textmessage.otui'
 
 -- private variables
 local bottomLabelWidget, centerLabelWidget
@@ -56,3 +56,7 @@ function Game.onTextMessage(type, message)
                   end, time)
   end
 end
+
+
+connect(Game, { onLogin = TextMessage.create,
+                onLogout = TextMessage.destroy })
\ No newline at end of file
diff --git a/modules/textmessage/textmessage.otmod b/modules/textmessage/textmessage.otmod
new file mode 100644
index 00000000..2edfca4d
--- /dev/null
+++ b/modules/textmessage/textmessage.otmod
@@ -0,0 +1,13 @@
+Module
+  name: textmessage
+  description: Manage game text messages
+  author: OTClient team
+  website: https://github.com/edubart/otclient
+  autoLoad: true
+  dependencies:
+    - game
+
+  onLoad: |
+    require 'textmessage'
+    return true
+
diff --git a/modules/game/ui/textmessage.otui b/modules/textmessage/textmessage.otui
similarity index 100%
rename from modules/game/ui/textmessage.otui
rename to modules/textmessage/textmessage.otui