diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-09-30 19:54:06 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-09-30 19:54:06 -0600 |
| commit | d4f32a38fd498c180d562ced38a9129e0abf2252 (patch) | |
| tree | e655b59ff686ad5fe2bdd11d6e072f5c3a4493b7 /src/engine.cpp | |
| parent | 6707d108790ab1fe1d4a3ef52d717966990fdf0a (diff) | |
| download | mana-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.gz mana-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.bz2 mana-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.xz mana-d4f32a38fd498c180d562ced38a9129e0abf2252.zip | |
Merge login state machines for both clients
Also do some cleanup and refactoring of related code.
Diffstat (limited to 'src/engine.cpp')
| -rw-r--r-- | src/engine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |