diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 17:50:05 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 17:50:05 +0100 |
| commit | bcf80bb0f25ac5beffc62e964fa60f888023510c (patch) | |
| tree | 524a7fa5f5e2e72d63a22575cd0730b475f0526d /src | |
| parent | c70c6d19c1cabf46b595591802bceab63d371788 (diff) | |
| download | manaserv-bcf80bb0f25ac5beffc62e964fa60f888023510c.tar.gz manaserv-bcf80bb0f25ac5beffc62e964fa60f888023510c.tar.bz2 manaserv-bcf80bb0f25ac5beffc62e964fa60f888023510c.tar.xz manaserv-bcf80bb0f25ac5beffc62e964fa60f888023510c.zip | |
Revert "Revert "Moved order of sending gender""
This reverts commit d707495540581f8c1b9ab3d5007c9c4d1ab83b53.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/manaserv_protocol.h | 8 | ||||
| -rw-r--r-- | src/game-server/state.cpp | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h index 6a1e31d6..1fc85ba6 100644 --- a/src/common/manaserv_protocol.h +++ b/src/common/manaserv_protocol.h @@ -126,10 +126,10 @@ enum { PGMSG_LOWER_ATTRIBUTE = 0x0170, // W attribute GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, W attribute PGMSG_RESPAWN = 0x0180, // - - GPMSG_BEING_ENTER = 0x0200, // B type, W being id, B action, W*2 position, B direction - // character: S name, B hair style, B hair color, B gender, B sprite layers changed, { B slot type, W item id }* - // monster: W type id gender - // npc: W type id gender + GPMSG_BEING_ENTER = 0x0200, // B type, W being id, B action, W*2 position, B direction, B gender + // character: S name, B hair style, B hair color, B sprite layers changed, { B slot type, W item id }* + // monster: W type id + // npc: W type id GPMSG_BEING_LEAVE = 0x0201, // W being id GPMSG_ITEM_APPEAR = 0x0202, // W item id, W*2 position GPMSG_BEING_LOOKS_CHANGE = 0x0210, // B sprite layers changed, { B slot type, W item id }* diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index 5353a236..6fdfb6f5 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -254,6 +254,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: @@ -262,7 +263,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; @@ -271,7 +271,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: @@ -279,7 +278,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: |