diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-15 12:09:45 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-17 22:21:53 +0200 |
| commit | da03d6fcdd76774fd97e94227f32b9574f52bc18 (patch) | |
| tree | 9505510e5f9899e3a29e0fb99094441ff343149e /src/net | |
| parent | b86b23225eedc5ca7fe313cc6485138e1f69cadb (diff) | |
| download | mana-client-da03d6fcdd76774fd97e94227f32b9574f52bc18.tar.gz mana-client-da03d6fcdd76774fd97e94227f32b9574f52bc18.tar.bz2 mana-client-da03d6fcdd76774fd97e94227f32b9574f52bc18.tar.xz mana-client-da03d6fcdd76774fd97e94227f32b9574f52bc18.zip | |
Fixed a possible crash on logging in to the map server
The Game instance was created too late, in some cases after messages
were received by the BeingHandler. This caused crashes since the
BeingHandler tried to use the BeingManager, which hadn't been created
yet.
(cherry picked from commit c7e57369f066ee9b7f9f62eacb19e2d10f8e13c5)
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/maphandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/ea/maphandler.cpp b/src/net/ea/maphandler.cpp index 76b3c480..c7ff0ec7 100644 --- a/src/net/ea/maphandler.cpp +++ b/src/net/ea/maphandler.cpp @@ -27,6 +27,7 @@ #include "net/messagein.h" #include "net/messageout.h" +#include "game.h" #include "localplayer.h" #include "log.h" #include "main.h" @@ -37,6 +38,7 @@ #include "utils/stringutils.h" Net::MapHandler *mapHandler; +extern Game *game; namespace EAthena { @@ -65,6 +67,7 @@ void MapHandler::handleMessage(MessageIn &msg) logger->log("Protocol: Player start position: (%d, %d), Direction: %d", player_node->mX, player_node->mY, direction); state = STATE_GAME; + game = new Game; break; case SMSG_SERVER_PING: |