From d4f32a38fd498c180d562ced38a9129e0abf2252 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 30 Sep 2009 19:54:06 -0600
Subject: Merge login state machines for both clients

Also do some cleanup and refactoring of related code.
---
 src/engine.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/engine.cpp')

diff --git a/src/engine.cpp b/src/engine.cpp
index f56f8a49..2cb48ba0 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -34,7 +34,7 @@
 #include "gui/okdialog.h"
 #include "gui/viewport.h"
 
-#include "net/maphandler.h"
+#include "net/gamehandler.h"
 #include "net/net.h"
 
 #include "resources/mapreader.h"
@@ -44,6 +44,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
+#include <assert.h>
+
 Engine::Engine():
     mCurrentMap(0)
 {
@@ -108,7 +110,7 @@ bool Engine::changeMap(const std::string &mapPath)
     delete mCurrentMap;
     mCurrentMap = newMap;
 
-    Net::getMapHandler()->mapLoaded(mapPath);
+    Net::getGameHandler()->mapLoaded(mapPath);
     return true;
 }
 
-- 
cgit v1.2.3-70-g09d2