summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-12 21:21:29 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-12 21:21:29 +0300
commit15528534932fc1a7ce28323f75963a1060dd1a7f (patch)
treee75694206e5c636bd387c4a58536ed6e966ac634
parent10e1a4858db10445f4c9b3f7b5574612e28a57a5 (diff)
downloadmanaplus-15528534932fc1a7ce28323f75963a1060dd1a7f.tar.gz
manaplus-15528534932fc1a7ce28323f75963a1060dd1a7f.tar.bz2
manaplus-15528534932fc1a7ce28323f75963a1060dd1a7f.tar.xz
manaplus-15528534932fc1a7ce28323f75963a1060dd1a7f.zip
Fix loading weapon sprite in char selection dialog.
-rw-r--r--src/net/eathena/charserverhandler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index a898d3162..7ff8e40d3 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -232,8 +232,9 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
msg.readInt16("speed");
const uint16_t race = msg.readInt16("class");
// tempPlayer->setSubtype(race, 0);
- const int hairStyle = msg.readInt16("hair style");
- const int weapon = msg.readInt32("weapon");
+ const int hairStyle = msg.readInt32("hair style");
+ const int option = (msg.readInt16("weapon") | 1) ^ 1;
+ const int weapon = 0;
tempPlayer->setSprite(SPRITE_BODY, weapon, "", 1, true);