summaryrefslogtreecommitdiff
path: root/src/net/ea/playerhandler.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-27 16:24:01 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-27 16:24:01 -0600
commitf67237cb69599753192c301f0f2eb38b88f7b57a (patch)
treea38b31447423e7971601f8a7e9528d204d7fcc26 /src/net/ea/playerhandler.cpp
parent60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd (diff)
downloadmana-client-f67237cb69599753192c301f0f2eb38b88f7b57a.tar.gz
mana-client-f67237cb69599753192c301f0f2eb38b88f7b57a.tar.bz2
mana-client-f67237cb69599753192c301f0f2eb38b88f7b57a.tar.xz
mana-client-f67237cb69599753192c301f0f2eb38b88f7b57a.zip
Clean up some ifdefs and start cleanup of parties
Diffstat (limited to 'src/net/ea/playerhandler.cpp')
-rw-r--r--src/net/ea/playerhandler.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index bf775f51..05f74630 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -24,6 +24,7 @@
#include "net/ea/protocol.h"
#include "net/messagein.h"
+#include "net/messageout.h"
#include "engine.h"
#include "localplayer.h"
@@ -193,7 +194,9 @@ void PlayerHandler::handleMessage(MessageIn &msg)
nearby = (engine->getCurrentMapName() == mapPath);
// Switch the actual map, deleting the previous one if necessary
- engine->changeMap(mapPath);
+ mapPath = mapPath.substr(0, mapPath.rfind("."));
+ if (engine->changeMap(mapPath))
+ MessageOut outMsg(CMSG_MAP_LOADED);
float scrollOffsetX = 0.0f;
float scrollOffsetY = 0.0f;