summaryrefslogtreecommitdiff
path: root/src/net/tmwa/charserverhandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-15 13:52:07 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-15 13:52:07 +0300
commite39ac061384a0877367b9a7fbd24b1a01626be3d (patch)
treea1de64c672bbdc8fc57aa5e08651bf8892057498 /src/net/tmwa/charserverhandler.cpp
parenta239e426893cb1526769bb65719f9bb673ea14a4 (diff)
downloadmanaplus-e39ac061384a0877367b9a7fbd24b1a01626be3d.tar.gz
manaplus-e39ac061384a0877367b9a7fbd24b1a01626be3d.tar.bz2
manaplus-e39ac061384a0877367b9a7fbd24b1a01626be3d.tar.xz
manaplus-e39ac061384a0877367b9a7fbd24b1a01626be3d.zip
Remove hideShield setting.
Diffstat (limited to 'src/net/tmwa/charserverhandler.cpp')
-rw-r--r--src/net/tmwa/charserverhandler.cpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 57e7eea1b..37dc4828e 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -215,17 +215,8 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
msg.readUInt8("misc1 color"));
tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes,
"", msg.readUInt8("bottom clothes color"));
- // to avoid show error (error.xml) need remove this sprite
- if (!config.getBoolValue("hideShield"))
- {
- tempPlayer->setSprite(SPRITE_FLOOR, shield, "",
- msg.readUInt8("shield color"));
- }
- else
- {
- msg.readUInt8("shield color");
- }
-
+ tempPlayer->setSprite(SPRITE_FLOOR, shield, "",
+ msg.readUInt8("shield color"));
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, "",
msg.readUInt8("head option top color"));
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, "",
@@ -241,10 +232,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
tempPlayer->setSprite(SPRITE_SHIELD, cape);
tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1);
tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes);
- // to avoid show error (error.xml) need remove this sprite
- if (!config.getBoolValue("hideShield"))
- tempPlayer->setSprite(SPRITE_FLOOR, shield);
-
+ tempPlayer->setSprite(SPRITE_FLOOR, shield);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat); // head option top
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes);
tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);