Simplified player subsprite handling by treating equipment, hairstyle and base sprites alike. Implementing female hairstyles is now a purely content-sided task.

3 files changed, 18 insertions, 18 deletions

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index e54a66ed..6100e76f 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -108,9 +108,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
             hairStyle = msg->readInt16();
-            dstBeing->setVisibleEquipment(
+            dstBeing->setSprite(
                     Being::WEAPON_SPRITE, msg->readInt16());
-            dstBeing->setVisibleEquipment(
+            dstBeing->setSprite(
                     Being::BOTTOMCLOTHES_SPRITE, msg->readInt16());
 
             if (msg->getId() == SMSG_BEING_MOVE)
@@ -121,8 +121,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt16();  // shield
             headTop = msg->readInt16();
             headMid = msg->readInt16();
-            dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop);
-            dstBeing->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, headMid);
+            dstBeing->setSprite(Being::HAT_SPRITE, headTop);
+            dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
             hairColor = msg->readInt16();
             msg->readInt16();  // unknown
             msg->readInt16();  // head dir
@@ -263,18 +263,18 @@ void BeingHandler::handleMessage(MessageIn *msg)
                     dstBeing->setHairStyle(id, -1);
                     break;
                 case 2:
-                    dstBeing->setVisibleEquipment(Being::WEAPON_SPRITE, id);
+                    dstBeing->setSprite(Being::WEAPON_SPRITE, id);
                     break;
                 case 3:     // Change lower headgear for eAthena, pants for us
-                    dstBeing->setVisibleEquipment(
+                    dstBeing->setSprite(
                             Being::BOTTOMCLOTHES_SPRITE, id);
                     break;
                 case 4:     // Change upper headgear for eAthena, hat for us
-                    dstBeing->setVisibleEquipment(
+                    dstBeing->setSprite(
                             Being::HAT_SPRITE, id);
                     break;
                 case 5:     // Change middle headgear for eathena, armor for us
-                     dstBeing->setVisibleEquipment(
+                     dstBeing->setSprite(
                             Being::TOPCLOTHES_SPRITE, id);
                     break;
                 case 6:
@@ -316,7 +316,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
             hairStyle = msg->readInt16();
-            dstBeing->setVisibleEquipment(
+            dstBeing->setSprite(
                     Being::WEAPON_SPRITE, msg->readInt16());
             msg->readInt16();  // item id 2
             headBottom = msg->readInt16();
@@ -337,10 +337,10 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt8();   // karma
             dstBeing->setGender(1 - msg->readInt8());   // gender
             dstBeing->setHairStyle(hairStyle, hairColor);
-            dstBeing->setVisibleEquipment(
+            dstBeing->setSprite(
                     Being::BOTTOMCLOTHES_SPRITE, headBottom);
-            dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop);
-            dstBeing->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, headMid);
+            dstBeing->setSprite(Being::HAT_SPRITE, headTop);
+            dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
 
             if (msg->getId() == SMSG_PLAYER_MOVE)
             {
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 063be212..5c275b94 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -204,13 +204,13 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     msg.readInt16();                       // class
     int hairStyle = msg.readInt16();
     Uint16 weapon = msg.readInt16();
-    tempPlayer->setVisibleEquipment(Being::WEAPON_SPRITE, weapon);
+    tempPlayer->setSprite(Being::WEAPON_SPRITE, weapon);
     tempPlayer->mLevel = msg.readInt16();
     msg.readInt16();                       // skill point
-    tempPlayer->setVisibleEquipment(Being::BOTTOMCLOTHES_SPRITE, msg.readInt16()); // head bottom
+    tempPlayer->setSprite(Being::BOTTOMCLOTHES_SPRITE, msg.readInt16()); // head bottom
     msg.readInt16();                       // shield
-    tempPlayer->setVisibleEquipment(Being::HAT_SPRITE, msg.readInt16()); // head option top
-    tempPlayer->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid
+    tempPlayer->setSprite(Being::HAT_SPRITE, msg.readInt16()); // head option top
+    tempPlayer->setSprite(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid
     int hairColor = msg.readInt16();
     tempPlayer->setHairStyle(hairStyle, hairColor);
     msg.readInt16();                       // unknown
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 60be5c74..84da9365 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -141,7 +141,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
             if (!being)
                 break;
 
-            being->setVisibleEquipment(Being::WEAPON_SPRITE, itemId);
+            being->setSprite(Being::WEAPON_SPRITE, itemId);
             break;
 
         case SMSG_PLAYER_UNEQUIP:
@@ -184,7 +184,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 case 536:
                 case 1200:
                 case 1201:
-                    player_node->setVisibleEquipment(Being::WEAPON_SPRITE, 0);
+                    player_node->setSprite(Being::WEAPON_SPRITE, 0);
                     // TODO: Why this break? Shouldn't a weapon be
                     //       unequipped in inventory too?
                     break;