diff options
Diffstat (limited to 'src/game-server/state.cpp')
| -rw-r--r-- | src/game-server/state.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index 3bed559f..a7cac98c 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -80,8 +80,11 @@ static std::map< std::string, std::string > mScriptVariables; */ static void serializeLooks(Entity *ch, MessageOut &msg) { - const EquipData &equipData = ch->getComponent<CharacterComponent>() - ->getPossessions().getEquipment(); + auto *characterComponent = ch->getComponent<CharacterComponent>(); + msg.writeInt8(characterComponent->getHairStyle()); + msg.writeInt8(characterComponent->getHairColor()); + const EquipData &equipData = + characterComponent->getPossessions().getEquipment(); // We'll use a set to check whether we already sent the update for the given // item instance. @@ -180,12 +183,6 @@ static void informPlayer(MapComposite *map, Entity *p) MessageOut LooksMsg(GPMSG_BEING_LOOKS_CHANGE); LooksMsg.writeInt16(oid); serializeLooks(o, LooksMsg); - auto *characterComponent = - o->getComponent<CharacterComponent>(); - LooksMsg.writeInt16(characterComponent->getHairStyle()); - LooksMsg.writeInt16(characterComponent->getHairColor()); - LooksMsg.writeInt16( - o->getComponent<BeingComponent>()->getGender()); gameHandler->sendTo(p, LooksMsg); } @@ -286,8 +283,6 @@ static void informPlayer(MapComposite *map, Entity *p) o->getComponent<CharacterComponent>(); enterMsg.writeString( o->getComponent<BeingComponent>()->getName()); - enterMsg.writeInt8(characterComponent->getHairStyle()); - enterMsg.writeInt8(characterComponent->getHairColor()); serializeLooks(o, enterMsg); } break; |