Replace some state-related netcode methods with events

Also move the virtual destructors of the Net handler base classes to
the top of their method lists.

Reviewed-by: Chuck Miller

1 files changed, 18 insertions, 10 deletions

diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 179d98e4..4810a3ea 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -22,6 +22,7 @@
 #include "net/tmwa/gamehandler.h"
 
 #include "client.h"
+#include "event.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
@@ -58,6 +59,8 @@ GameHandler::GameHandler()
     };
     handledMessages = _messages;
     gameHandler = this;
+
+    listen("Game");
 }
 
 void GameHandler::handleMessage(Net::MessageIn &msg)
@@ -104,6 +107,21 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
+void GameHandler::event(const std::string &channel, const Mana::Event &event)
+{
+    if (channel == "Game")
+    {
+        if (event.getName() == "EnginesInitalized")
+        {
+            Game::instance()->changeMap(mMap);
+        }
+        else if (event.getName() == "MapLoaded")
+        {
+            MessageOut outMsg(CMSG_MAP_LOADED);
+        }
+    }
+}
+
 void GameHandler::connect()
 {
     mNetwork->connect(mapServer);
@@ -141,16 +159,6 @@ void GameHandler::disconnect()
     mNetwork->disconnect();
 }
 
-void GameHandler::inGame()
-{
-    Game::instance()->changeMap(mMap);
-}
-
-void GameHandler::mapLoaded(const std::string &mapName)
-{
-    MessageOut outMsg(CMSG_MAP_LOADED);
-}
-
 void GameHandler::who()
 {
 }