3 files changed, 6 insertions, 3 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:
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index b7131f0a..8cc4b44f 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -422,10 +422,10 @@ void PlayerHandler::handleMessage(MessageIn &msg)
     }
 }
 
-void PlayerHandler::attack(Being *being)
+void PlayerHandler::attack(int id)
 {
     MessageOut outMsg(CMSG_PLAYER_ATTACK);
-    outMsg.writeInt32(being->getId());
+    outMsg.writeInt32(id);
     outMsg.writeInt8(0);
 }
 
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 94ae952f..4429d856 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -35,7 +35,7 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler
 
         void handleMessage(MessageIn &msg);
 
-        void attack(Being *being);
+        void attack(int id);
 
         void emote(int emoteId);