From 025e9b12601079e7aeaaaa25225e9dadc376240a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 8 Jun 2016 17:51:01 +0300
Subject: Remove default value from parameter isItemSprite in Being->setSprite.

---
 src/net/eathena/beinghandler.cpp   | 45 ++++++++++++++++++++++-----------
 src/net/eathena/beingrecv.cpp      | 51 +++++++++++++++++++++++++-------------
 src/net/eathena/charserverrecv.cpp | 33 ++++++++++++++++--------
 3 files changed, 86 insertions(+), 43 deletions(-)

(limited to 'src/net/eathena')

diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 19789f802..3274c56ee 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -54,77 +54,92 @@ void BeingHandler::undress(Being *const being) const
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_HEAD_BOTTOM,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_HEAD_TOP,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_HEAD_MID,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_CLOTHES_COLOR,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_SHIELD,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_FLOOR,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_ROBE,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_EVOL2,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_EVOL3,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_EVOL4,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_EVOL5,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_EVOL6,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_HAIR,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
     being->setSprite(SPRITE_SHOES,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false);
+        IsWeapon_false,
+        IsTempSprite_false);
 }
 
 void BeingHandler::requestRanks(const RankT rank) const
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index ea84fe0d0..93fad8f4d 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -164,12 +164,14 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 "",
                 itemColor,
-                IsWeapon_true);
+                IsWeapon_true,
+                IsTempSprite_false);
             dstBeing->setSprite(SPRITE_FLOOR,
                 id2,
                 std::string(),
                 ItemColor_one,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
@@ -178,7 +180,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
             break;
@@ -187,7 +190,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
             break;
@@ -197,7 +201,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
             break;
@@ -216,7 +221,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
@@ -225,7 +231,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
             break;
@@ -234,7 +241,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
             break;
@@ -243,7 +251,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
             break;
@@ -252,7 +261,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
             break;
@@ -261,7 +271,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
             break;
@@ -270,7 +281,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
             break;
@@ -279,7 +291,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
             break;
@@ -288,7 +301,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3);
             break;
@@ -297,7 +311,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4);
             break;
@@ -306,7 +321,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL5);
             break;
@@ -315,7 +331,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false);
+                IsWeapon_false,
+                IsTempSprite_false);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6);
             break;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 67917cfd8..817d21da6 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -133,7 +133,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
         weapon,
         "",
         ItemColor_one,
-        IsWeapon_true);
+        IsWeapon_true,
+        IsTempSprite_false);
 
     data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
 
@@ -151,7 +152,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
             0,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
     }
     else
     {
@@ -160,7 +162,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
             ItemDB::get(-hairStyle).getDyeColorsString(
             color),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
     }
 
     const uint16_t look = msg.readInt16("clothes color");
@@ -193,42 +196,50 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
             shoes,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
         tempPlayer->setSprite(SPRITE_SHOES,
             gloves,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
         tempPlayer->setSprite(SPRITE_SHIELD,
             cape,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
         tempPlayer->setSprite(SPRITE_HEAD_TOP,
             misc1,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
         tempPlayer->setSprite(SPRITE_WEAPON,
             bottomClothes,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
         tempPlayer->setSprite(SPRITE_FLOOR,
             shield,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
         tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
             hat,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
         tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
             topClothes,
             std::string(),
             ItemColor_one,
-            IsWeapon_false);
+            IsWeapon_false,
+            IsTempSprite_false);
 //        tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
     }
     if (packetVersion >= 20110928)
-- 
cgit v1.2.3-70-g09d2