summaryrefslogtreecommitdiff
path: root/src/net/eathena/charserverrecv.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-20 19:49:01 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-20 19:49:01 +0300
commit0cf09f63f5c626738f2dfdec82da876723b0db89 (patch)
treeb6b9d22c0b4cc2f51957355271eedbc26fd42aee /src/net/eathena/charserverrecv.cpp
parent682ae29f4861c1434db7f5f885cd5062d73b0d1a (diff)
downloadmanaplus-0cf09f63f5c626738f2dfdec82da876723b0db89.tar.gz
manaplus-0cf09f63f5c626738f2dfdec82da876723b0db89.tar.bz2
manaplus-0cf09f63f5c626738f2dfdec82da876723b0db89.tar.xz
manaplus-0cf09f63f5c626738f2dfdec82da876723b0db89.zip
Add explicit keyword into CardsList.
Diffstat (limited to 'src/net/eathena/charserverrecv.cpp')
-rw-r--r--src/net/eathena/charserverrecv.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index d3300f092..8b9de16a9 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -133,7 +133,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
weapon,
"",
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setWeaponId(weapon);
data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
@@ -152,7 +152,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
0,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
}
else
{
@@ -161,7 +161,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
ItemDB::get(-hairStyle).getDyeColorsString(
color),
ItemColor_one,
- nullptr);
+ zeroCards);
}
const uint16_t look = msg.readInt16("clothes color");
@@ -194,42 +194,42 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
shoes,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
ItemColor_one,
- nullptr);
+ zeroCards);
// tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
}
if (packetVersion >= 20110928)