diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/beinghandler.cpp | 15 | ||||
| -rw-r--r-- | src/net/charserverhandler.cpp | 5 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 74d1e2d1..e54a66ed 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -67,6 +67,7 @@ void BeingHandler::handleMessage(MessageIn *msg) Sint16 param1; Sint8 type; Being *srcBeing, *dstBeing; + int hairStyle, hairColor; switch (msg->getId()) { @@ -106,7 +107,7 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->setWalkSpeed(speed); dstBeing->mJob = job; - dstBeing->setHairStyle(msg->readInt16()); + hairStyle = msg->readInt16(); dstBeing->setVisibleEquipment( Being::WEAPON_SPRITE, msg->readInt16()); dstBeing->setVisibleEquipment( @@ -122,7 +123,7 @@ void BeingHandler::handleMessage(MessageIn *msg) headMid = msg->readInt16(); dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop); dstBeing->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, headMid); - dstBeing->setHairColor(msg->readInt16()); + hairColor = msg->readInt16(); msg->readInt16(); // unknown msg->readInt16(); // head dir msg->readInt16(); // guild @@ -132,6 +133,7 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt16(); // karma msg->readInt8(); // unknown dstBeing->setGender(1 - msg->readInt8()); // gender + dstBeing->setHairStyle(hairStyle, hairColor); if (msg->getId() == SMSG_BEING_MOVE) { @@ -258,7 +260,7 @@ void BeingHandler::handleMessage(MessageIn *msg) switch (type) { case 1: - dstBeing->setHairStyle(id); + dstBeing->setHairStyle(id, -1); break; case 2: dstBeing->setVisibleEquipment(Being::WEAPON_SPRITE, id); @@ -276,7 +278,7 @@ void BeingHandler::handleMessage(MessageIn *msg) Being::TOPCLOTHES_SPRITE, id); break; case 6: - dstBeing->setHairColor(id); + dstBeing->setHairStyle(-1, id); break; default: logger->log("SMSG_BEING_CHANGE_LOOKS: unsupported type: " @@ -313,7 +315,7 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->setWalkSpeed(speed); dstBeing->mJob = job; - dstBeing->setHairStyle(msg->readInt16()); + hairStyle = msg->readInt16(); dstBeing->setVisibleEquipment( Being::WEAPON_SPRITE, msg->readInt16()); msg->readInt16(); // item id 2 @@ -326,7 +328,7 @@ void BeingHandler::handleMessage(MessageIn *msg) headTop = msg->readInt16(); headMid = msg->readInt16(); - dstBeing->setHairColor(msg->readInt16()); + hairColor = msg->readInt16(); msg->readInt16(); // unknown msg->readInt16(); // head dir msg->readInt32(); // guild @@ -334,6 +336,7 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt16(); // manner msg->readInt8(); // karma dstBeing->setGender(1 - msg->readInt8()); // gender + dstBeing->setHairStyle(hairStyle, hairColor); dstBeing->setVisibleEquipment( Being::BOTTOMCLOTHES_SPRITE, headBottom); dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop); diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index b25b0453..063be212 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -202,7 +202,7 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot) tempPlayer->mMaxMp = msg.readInt16(); msg.readInt16(); // speed msg.readInt16(); // class - tempPlayer->setHairStyle(msg.readInt16()); + int hairStyle = msg.readInt16(); Uint16 weapon = msg.readInt16(); tempPlayer->setVisibleEquipment(Being::WEAPON_SPRITE, weapon); tempPlayer->mLevel = msg.readInt16(); @@ -211,7 +211,8 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot) msg.readInt16(); // shield tempPlayer->setVisibleEquipment(Being::HAT_SPRITE, msg.readInt16()); // head option top tempPlayer->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid - tempPlayer->setHairColor(msg.readInt16()); + int hairColor = msg.readInt16(); + tempPlayer->setHairStyle(hairStyle, hairColor); msg.readInt16(); // unknown tempPlayer->setName(msg.readString(24)); for (int i = 0; i < 6; i++) { |