summaryrefslogtreecommitdiff
path: root/src/game-server/state.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2012-10-22 20:02:02 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2012-10-22 20:02:02 +0200
commitd707495540581f8c1b9ab3d5007c9c4d1ab83b53 (patch)
treec63c30ed245ab3ea4d19c3c2be5d6cba29d6d556 /src/game-server/state.cpp
parentdb1dcb4d8462e660279984c62292018c86b4f58b (diff)
downloadmanaserv-d707495540581f8c1b9ab3d5007c9c4d1ab83b53.tar.gz
manaserv-d707495540581f8c1b9ab3d5007c9c4d1ab83b53.tar.bz2
manaserv-d707495540581f8c1b9ab3d5007c9c4d1ab83b53.tar.xz
manaserv-d707495540581f8c1b9ab3d5007c9c4d1ab83b53.zip
Revert "Moved order of sending gender"
This reverts commit b2741a6c49eafb9f19f9cd6625836d85d31980b3.
Diffstat (limited to 'src/game-server/state.cpp')
-rw-r--r--src/game-server/state.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 83417763..249040a8 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -241,7 +241,6 @@ static void informPlayer(MapComposite *map, Character *p)
enterMsg.writeInt16(opos.x);
enterMsg.writeInt16(opos.y);
enterMsg.writeInt8(o->getDirection());
- enterMsg.writeInt8(o->getGender());
switch (otype)
{
case OBJECT_CHARACTER:
@@ -250,6 +249,7 @@ static void informPlayer(MapComposite *map, Character *p)
enterMsg.writeString(q->getName());
enterMsg.writeInt8(q->getHairStyle());
enterMsg.writeInt8(q->getHairColor());
+ enterMsg.writeInt8(q->getGender());
serializeLooks(q, enterMsg);
} break;
@@ -258,6 +258,7 @@ static void informPlayer(MapComposite *map, Character *p)
Monster *q = static_cast< Monster * >(o);
enterMsg.writeInt16(q->getSpecy()->getId());
enterMsg.writeString(q->getName());
+ enterMsg.writeInt8(q->getGender());
} break;
case OBJECT_NPC:
@@ -265,6 +266,7 @@ static void informPlayer(MapComposite *map, Character *p)
NPC *q = static_cast< NPC * >(o);
enterMsg.writeInt16(q->getNPC());
enterMsg.writeString(q->getName());
+ enterMsg.writeInt8(q->getGender());
} break;
default: