summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-08-26 13:32:07 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-08-26 13:32:07 +0000
commitdbb7564501b150ff1564d05151d4d63b63f22b97 (patch)
treed29ee9dae23a66eb7ed7b04a4637d05beb9073fe /src
parenta68f9691e20c6ab6e73333534b67a5491fb5e94c (diff)
downloadmanaserv-dbb7564501b150ff1564d05151d4d63b63f22b97.tar.gz
manaserv-dbb7564501b150ff1564d05151d4d63b63f22b97.tar.bz2
manaserv-dbb7564501b150ff1564d05151d4d63b63f22b97.tar.xz
manaserv-dbb7564501b150ff1564d05151d4d63b63f22b97.zip
Set an arbitrary starting position. Changed "say around" protocol.
Diffstat (limited to 'src')
-rw-r--r--src/accounthandler.cpp5
-rw-r--r--src/defines.h2
-rw-r--r--src/gamehandler.cpp2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/accounthandler.cpp b/src/accounthandler.cpp
index 783017f6..887dc193 100644
--- a/src/accounthandler.cpp
+++ b/src/accounthandler.cpp
@@ -179,9 +179,8 @@ AccountHandler::processMessage(NetComputer *comp, MessageIn &message)
computer.setCharacter(chars[charNum]);
PlayerPtr selectedChar = computer.getCharacter();
result.writeByte(ERRMSG_OK);
- //std::string mapName =
- // store.getMapNameFromId(selectedChar->getMapId());
- //result.writeString(mapName);
+
+ selectedChar->setXY(600, 600); // for testing purpose
selectedChar->setDestination(selectedChar->getX(),
selectedChar->getY());
diff --git a/src/defines.h b/src/defines.h
index 56ef210f..68ce8103 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -150,7 +150,7 @@ enum {
PGMSG_WALK = 0x0260, // W*2 destination
GPMSG_BEINGS_MOVE = 0x0280, // { L being id, W*2 position, W*2 destination }*
PGMSG_SAY = 0x02A0, // S text
- GPMSG_SAY = 0x02A1, // S being, S text
+ GPMSG_SAY = 0x02A1, // L being id, S text
PGMSG_USE_ITEM = 0x0300, // L item id
GPMSG_USE_RESPONSE = 0x0301, // B error
PGMSG_EQUIP = 0x0302, // L item id, B slot
diff --git a/src/gamehandler.cpp b/src/gamehandler.cpp
index 20c073ce..6305f410 100644
--- a/src/gamehandler.cpp
+++ b/src/gamehandler.cpp
@@ -227,7 +227,7 @@ void GameHandler::sayAround(GameClient &computer, std::string const &text)
PlayerPtr beingPtr = computer.getCharacter();
MessageOut msg(GPMSG_SAY);
- msg.writeString(beingPtr->getName());
+ msg.writeLong(beingPtr->getID());
msg.writeString(text);
unsigned speakerMapId = beingPtr->getMapId();