summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-08-04 07:24:51 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-08-04 07:24:51 +0000
commitaa4de5dfa66533be42478ec2526307a46e1fc9c6 (patch)
tree0aed5c3a79f7d7dd4ddef2347c8df9016e85a3ab
parent1ca7028c99319e5dc04cb34c1839b04e3de045f2 (diff)
downloadmanaserv-aa4de5dfa66533be42478ec2526307a46e1fc9c6.tar.gz
manaserv-aa4de5dfa66533be42478ec2526307a46e1fc9c6.tar.bz2
manaserv-aa4de5dfa66533be42478ec2526307a46e1fc9c6.tar.xz
manaserv-aa4de5dfa66533be42478ec2526307a46e1fc9c6.zip
Fixed Player ID in messages.
-rw-r--r--ChangeLog1
-rw-r--r--src/state.cpp6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b4504c1b..9fabdc64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* src/object.h, src/object.cpp, src/being.h, src/dalstorage.cpp: Added
the database primary key to Player.
+ * src/state.cpp: Used Player ID.
2006-08-03 Guillaume Melquiond <guillaume.melquiond@gmail.com>
diff --git a/src/state.cpp b/src/state.cpp
index 53ddb7ac..ae3ceda4 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -64,7 +64,7 @@ void State::addObject(ObjectPtr objectPtr) {
MessageOut msg;
msg.writeShort(GPMSG_BEING_ENTER);
msg.writeByte(OBJECT_PLAYER);
- msg.writeLong(0); // ID
+ msg.writeLong(playerPtr->getID());
msg.writeString(playerPtr->getName());
msg.writeByte(playerPtr->getHairStyle());
msg.writeByte(playerPtr->getHairColor());
@@ -93,7 +93,7 @@ void State::removeObject(ObjectPtr objectPtr) {
MessageOut msg;
msg.writeShort(GPMSG_BEING_LEAVE);
msg.writeByte(OBJECT_PLAYER);
- msg.writeLong(0); // ID
+ msg.writeLong(playerPtr->getID());
Players::iterator p_end = players.end(), j = p_end;
for (Players::iterator p = players.begin(); p != p_end; ++p) {
if (p->get() == playerPtr.get())
@@ -114,7 +114,7 @@ void State::informPlayer(PlayerPtr playerPtr) {
MessageOut msg;
msg.writeShort(GPMSG_BEING_ENTER);
msg.writeByte(OBJECT_PLAYER);
- msg.writeLong(0); // ID
+ msg.writeLong((*p)->getID());
msg.writeString((*p)->getName());
msg.writeByte((*p)->getHairStyle());
msg.writeByte((*p)->getHairColor());