summaryrefslogtreecommitdiff
path: root/src/game-server/gamehandler.cpp
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-01-03 17:10:43 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-01-03 17:10:43 +0000
commit1673de8b5553f6dcd4898c84b8d44ba8b30740f1 (patch)
tree3dcc47461a6b4914c4e81492e7be885c3a1502ea /src/game-server/gamehandler.cpp
parent6b7441516002d6e7cca424416bb67c6bc7d7c9d2 (diff)
downloadmanaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.tar.gz
manaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.tar.bz2
manaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.tar.xz
manaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.zip
Split persistent player data from game server data. Enabled inventory code back.
Diffstat (limited to 'src/game-server/gamehandler.cpp')
-rw-r--r--src/game-server/gamehandler.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index 56b9533c..f7a3905a 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -24,8 +24,8 @@
#include <cassert>
#include <map>
-#include "map.h"
#include "game-server/gamehandler.hpp"
+#include "game-server/map.hpp"
#include "game-server/state.hpp"
#include "net/messagein.hpp"
#include "net/messageout.hpp"
@@ -231,7 +231,6 @@ void GameHandler::processMessage(NetComputer *comp, MessageIn &message)
gameState->sayAround(computer.character, say);
} break;
- /*
case PGMSG_PICKUP:
{
// add item to inventory (this is too simplistic atm)
@@ -260,7 +259,6 @@ void GameHandler::processMessage(NetComputer *comp, MessageIn &message)
result.writeByte(ERRMSG_FAILURE);
}
} break;
- */
case PGMSG_WALK:
{
@@ -272,7 +270,6 @@ void GameHandler::processMessage(NetComputer *comp, MessageIn &message)
// no response should be required
} break;
- /*
case PGMSG_EQUIP:
{
message.readLong(); // ItemId: Not useful, the inventory knows it
@@ -282,7 +279,6 @@ void GameHandler::processMessage(NetComputer *comp, MessageIn &message)
result.writeByte(computer.character->equip(slot) ?
ERRMSG_OK : ERRMSG_FAILURE);
} break;
- */
case PGMSG_ATTACK:
{