summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-08 17:38:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-08 17:38:06 +0300
commitca23f86b2b1ae730d0511bb1613e5f4b7211c8d7 (patch)
tree729fbb5786bdf41ae8004e1850248ca2e890974c /src/net
parent8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6 (diff)
downloadmv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.gz
mv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.bz2
mv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.xz
mv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.zip
Remove default value from parameter isWeapon in Being->setSprite.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/beinghandler.cpp45
-rw-r--r--src/net/eathena/beingrecv.cpp93
-rw-r--r--src/net/eathena/charserverrecv.cpp33
-rw-r--r--src/net/tmwa/beinghandler.cpp15
-rw-r--r--src/net/tmwa/beingrecv.cpp36
-rw-r--r--src/net/tmwa/charserverrecv.cpp33
6 files changed, 186 insertions, 69 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 0243f1899..19789f802 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -53,63 +53,78 @@ void BeingHandler::undress(Being *const being) const
being->setSprite(SPRITE_WEAPON,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HEAD_TOP,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HEAD_MID,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_SHIELD,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_FLOOR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_ROBE,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_EVOL2,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_EVOL3,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_EVOL4,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_EVOL5,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_EVOL6,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
void BeingHandler::requestRanks(const RankT rank) const
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 4c7e2727e..ea84fe0d0 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -168,23 +168,36 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 3: // LOOK_HEAD_BOTTOM
- dstBeing->setSprite(SPRITE_WEAPON, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_WEAPON,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
break;
case 4: // LOOK_HEAD_TOP Change upper headgear for eAthena, hat for us
- dstBeing->setSprite(SPRITE_CLOTHES_COLOR, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_CLOTHES_COLOR,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
break;
case 5: // LOOK_HEAD_MID Change middle headgear for eathena,
// armor for us
- dstBeing->setSprite(SPRITE_HEAD_BOTTOM, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_HEAD_BOTTOM,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
break;
@@ -199,62 +212,110 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
dstBeing->setLook(CAST_U8(id));
break;
case 8: // eAthena LOOK_SHIELD
- dstBeing->setSprite(SPRITE_FLOOR, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_FLOOR,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 9: // eAthena LOOK_SHOES
- dstBeing->setSprite(SPRITE_HAIR, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_HAIR,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
break;
case 10: // LOOK_GLOVES
- dstBeing->setSprite(SPRITE_SHOES, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_SHOES,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
break;
case 11: // LOOK_FLOOR
- dstBeing->setSprite(SPRITE_SHIELD, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_SHIELD,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
break;
case 12: // LOOK_ROBE
- dstBeing->setSprite(SPRITE_HEAD_TOP, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_HEAD_TOP,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
break;
case 13: // COSTUME_HEAD_TOP
- dstBeing->setSprite(SPRITE_HEAD_MID, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_HEAD_MID,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
break;
case 14: // COSTUME_HEAD_MID
- dstBeing->setSprite(SPRITE_ROBE, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_ROBE,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
break;
case 15: // COSTUME_HEAD_LOW
- dstBeing->setSprite(SPRITE_EVOL2, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_EVOL2,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
break;
case 16: // COSTUME_GARMENT
- dstBeing->setSprite(SPRITE_EVOL3, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_EVOL3,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3);
break;
case 17: // ARMOR
- dstBeing->setSprite(SPRITE_EVOL4, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_EVOL4,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4);
break;
case 18:
- dstBeing->setSprite(SPRITE_EVOL5, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_EVOL5,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL5);
break;
case 19:
- dstBeing->setSprite(SPRITE_EVOL6, id, color, itemColor);
+ dstBeing->setSprite(SPRITE_EVOL6,
+ id,
+ color,
+ itemColor,
+ IsWeapon_false);
if (localPlayer)
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6);
break;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index e10339b40..67917cfd8 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -147,7 +147,11 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setHairColor(color);
if (hairStyle == 0)
{
- tempPlayer->setSprite(SPRITE_HAIR_COLOR, 0, std::string(), ItemColor_one);
+ tempPlayer->setSprite(SPRITE_HAIR_COLOR,
+ 0,
+ std::string(),
+ ItemColor_one,
+ IsWeapon_false);
}
else
{
@@ -155,7 +159,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
hairStyle * -1,
ItemDB::get(-hairStyle).getDyeColorsString(
color),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
const uint16_t look = msg.readInt16("clothes color");
@@ -187,35 +192,43 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setSprite(SPRITE_HAIR,
shoes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
// tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
}
if (packetVersion >= 20110928)
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 159e56fb8..59a34332b 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -52,23 +52,28 @@ void BeingHandler::undress(Being *const being) const
being->setSprite(SPRITE_WEAPON,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HEAD_BOTTOM,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_CLOTHES_COLOR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_HAIR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
being->setSprite(SPRITE_SHOES,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
#ifdef EATHENA_SUPPORT
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 8a47b1aca..167e0042f 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -151,28 +151,32 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
dstBeing->setSprite(SPRITE_FLOOR,
id2,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 3: // Change lower headgear for eAthena, pants for us
dstBeing->setSprite(SPRITE_WEAPON,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
break;
case 4: // Change upper headgear for eAthena, hat for us
dstBeing->setSprite(SPRITE_CLOTHES_COLOR,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
break;
case 5: // Change middle headgear for eathena, armor for us
dstBeing->setSprite(SPRITE_HEAD_BOTTOM,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
break;
case 6: // eAthena LOOK_HAIR_COLOR
@@ -186,56 +190,64 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
dstBeing->setSprite(SPRITE_FLOOR,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
break;
case 9: // eAthena LOOK_SHOES
dstBeing->setSprite(SPRITE_HAIR,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
break;
case 10: // LOOK_GLOVES
dstBeing->setSprite(SPRITE_SHOES,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
break;
case 11: // LOOK_CAPE
dstBeing->setSprite(SPRITE_SHIELD,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
break;
case 12:
dstBeing->setSprite(SPRITE_HEAD_TOP,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
break;
case 13:
dstBeing->setSprite(SPRITE_HEAD_MID,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
break;
case 14:
dstBeing->setSprite(SPRITE_ROBE,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
break;
case 15:
dstBeing->setSprite(SPRITE_EVOL2,
id,
color,
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
break;
case 16:
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 7c638882e..401585fc7 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -127,14 +127,16 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setSprite(SPRITE_HAIR_COLOR,
0,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
else
{
tempPlayer->setSprite(SPRITE_HAIR_COLOR,
hairStyle * -1,
ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
}
tempPlayer->setHairColor(hairColor);
@@ -153,39 +155,48 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
tempPlayer->setSprite(SPRITE_HAIR,
shoes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_SHOES,
gloves,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_SHIELD,
cape,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_TOP,
misc1,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_WEAPON,
bottomClothes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_FLOOR,
shield,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
hat,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
topClothes,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
tempPlayer->setSprite(SPRITE_HEAD_MID,
misc2,
std::string(),
- ItemColor_one);
+ ItemColor_one,
+ IsWeapon_false);
character->slot = msg.readUInt8("slot");
const uint8_t sex = CAST_U8(msg.readUInt8("gender"));