summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-21 15:46:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-21 15:46:14 +0300
commit5c61d7b6e04a824b9a60f25e73abd938487b2fc4 (patch)
tree73d9e751b32076a90f6277bda1eb8d6cc66d05a3 /src/net
parentfbadc806e050929f44b54fc2973a28d2fdfc516c (diff)
downloadplus-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.tar.gz
plus-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.tar.bz2
plus-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.tar.xz
plus-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.zip
Remove colorId parameter from Being::updateSprite.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/beingrecv.cpp5
-rw-r--r--src/net/ea/beingrecv.h3
-rw-r--r--src/net/eathena/beingrecv.cpp9
-rw-r--r--src/net/tmwa/beingrecv.cpp15
4 files changed, 11 insertions, 21 deletions
diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp
index 10694a8e9..a32ad0ecb 100644
--- a/src/net/ea/beingrecv.cpp
+++ b/src/net/ea/beingrecv.cpp
@@ -545,12 +545,11 @@ Being *BeingRecv::createBeing(const BeingId id,
void BeingRecv::setSprite(Being *const being,
const unsigned int slot,
const int id,
- const std::string &color,
- const ItemColor colorId)
+ const std::string &color)
{
if (!being)
return;
- being->updateSprite(slot, id, color, colorId);
+ being->updateSprite(slot, id, color);
}
} // namespace Ea
diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h
index 3ffc95367..0fe2ea234 100644
--- a/src/net/ea/beingrecv.h
+++ b/src/net/ea/beingrecv.h
@@ -56,8 +56,7 @@ namespace Ea
void setSprite(Being *const being,
const unsigned int slot,
const int id,
- const std::string &color = "",
- const ItemColor colorId = ItemColor_one);
+ const std::string &color = "");
} // namespace BeingRecv
} // namespace Ea
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index bffa9d274..fdc8ff5d6 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -467,8 +467,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
Ea::BeingRecv::setSprite(dstBeing,
SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ std::string());
dstBeing->setWeaponId(weapon);
// Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
}
@@ -673,8 +672,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
Ea::BeingRecv::setSprite(dstBeing,
SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ std::string());
dstBeing->setWeaponId(weapon);
}
// Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
@@ -877,8 +875,7 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
Ea::BeingRecv::setSprite(dstBeing,
SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ std::string());
dstBeing->setWeaponId(weapon);
// Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
}
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 8b073ea7d..78d40dc1d 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -315,8 +315,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg)
// Set these after the gender, as the sprites may be gender-specific
dstBeing->updateSprite(SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ "");
dstBeing->setWeaponId(weapon);
dstBeing->updateSprite(SPRITE_FLOOR, shield);
dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
@@ -461,8 +460,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg)
// Set these after the gender, as the sprites may be gender-specific
dstBeing->updateSprite(SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ "");
dstBeing->setWeaponId(weapon);
dstBeing->updateSprite(SPRITE_FLOOR, shield);
dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
@@ -607,8 +605,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg)
// Set these after the gender, as the sprites may be gender-specific
dstBeing->updateSprite(SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ "");
dstBeing->setWeaponId(weapon);
dstBeing->updateSprite(SPRITE_FLOOR, shield);
dstBeing->updateSprite(SPRITE_WEAPON, headBottom);
@@ -861,8 +858,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
Ea::BeingRecv::setSprite(dstBeing,
SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ std::string());
dstBeing->setWeaponId(weapon);
Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
}
@@ -1078,8 +1074,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
Ea::BeingRecv::setSprite(dstBeing,
SPRITE_BODY,
weapon,
- "",
- ItemColor_one);
+ std::string());
dstBeing->setWeaponId(weapon);
Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
}