summaryrefslogtreecommitdiff
path: root/src/game-server/state.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2012-10-11 20:02:10 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2012-10-11 20:26:42 +0200
commitb2741a6c49eafb9f19f9cd6625836d85d31980b3 (patch)
tree7d9c1a79e33675a240119afeee4dc99f5e6a22a9 /src/game-server/state.cpp
parent49762e3472fd4098fb3ae1a18f751024056e40df (diff)
downloadmanaserv-b2741a6c49eafb9f19f9cd6625836d85d31980b3.tar.gz
manaserv-b2741a6c49eafb9f19f9cd6625836d85d31980b3.tar.bz2
manaserv-b2741a6c49eafb9f19f9cd6625836d85d31980b3.tar.xz
manaserv-b2741a6c49eafb9f19f9cd6625836d85d31980b3.zip
Moved order of sending gender
Gender is shared. There is no reason in duplicating code *Breaks compatbility with old clients* *Requires clientside patch* Reviewed-by: Stefan Beller.
Diffstat (limited to 'src/game-server/state.cpp')
-rw-r--r--src/game-server/state.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 249040a8..83417763 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -241,6 +241,7 @@ 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:
@@ -249,7 +250,6 @@ 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,7 +258,6 @@ 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:
@@ -266,7 +265,6 @@ 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: