diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-27 23:28:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-27 23:28:11 +0300 |
commit | f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8 (patch) | |
tree | cf512c32dbc37283ce8c16901fb4df0082508d28 /src/net/tmwa/charserverrecv.cpp | |
parent | cd327e877804a824db51d1e0831ad9e13b0e18b3 (diff) | |
download | manaplus-f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8.tar.gz manaplus-f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8.tar.bz2 manaplus-f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8.tar.xz manaplus-f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8.zip |
Fix some false positive asserts in working with hair style equal to zero.
Diffstat (limited to 'src/net/tmwa/charserverrecv.cpp')
-rw-r--r-- | src/net/tmwa/charserverrecv.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 5032e4c39..428693678 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -118,8 +118,18 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, const ItemColor hairColor = fromInt( msg.readUInt8("hair color"), ItemColor); msg.readUInt8("unused"); - tempPlayer->setSprite(SPRITE_HAIR_COLOR, hairStyle * -1, - ItemDB::get(-hairStyle).getDyeColorsString(hairColor)); + if (hairStyle == 0) + { + tempPlayer->setSprite(SPRITE_HAIR_COLOR, + 0, + std::string()); + } + else + { + tempPlayer->setSprite(SPRITE_HAIR_COLOR, + hairStyle * -1, + ItemDB::get(-hairStyle).getDyeColorsString(hairColor)); + } tempPlayer->setHairColor(hairColor); const int misc2 = msg.readInt16("misc2"); |