Merge git://gitorious.org/~bertram/mana/manaserv-equipment-fix into equipment-fix

Conflicts:
	example/serverdata/scripts/maps/desert.lua

2 files changed, 3 insertions, 20 deletions

diff --git a/src/common/inventorydata.h b/src/common/inventorydata.h
index e1c5bfa..490abff 100644
--- a/src/common/inventorydata.h
+++ b/src/common/inventorydata.h
@@ -65,7 +65,7 @@ struct EquipmentItem
 // inventory slot id -> { item }
 typedef std::map< unsigned int, InventoryItem > InventoryData;
 
-// equip slot id -> { item id }
+// equip slot id -> { item id, item instance }
 // Equipment taking up multiple equip slot ids will be referenced multiple times
 typedef std::multimap< unsigned int, EquipmentItem > EquipData;
 
diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h
index 78cbbbf..2a340b8 100644
--- a/src/common/manaserv_protocol.h
+++ b/src/common/manaserv_protocol.h
@@ -108,12 +108,12 @@ enum {
     GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, W attribute

     PGMSG_RESPAWN                  = 0x0180, // -

     GPMSG_BEING_ENTER              = 0x0200, // B type, W being id, B action, W*2 position, B direction

-                                             // character: S name, B hair style, B hair color, B gender, B item bitmask, { W item id }*

+                                             // character: S name, B hair style, B hair color, B gender, B sprite layers changed, { B slot type, W item id }*

                                              // monster: W type id

                                              // npc: W type id

     GPMSG_BEING_LEAVE              = 0x0201, // W being id

     GPMSG_ITEM_APPEAR              = 0x0202, // W item id, W*2 position

-    GPMSG_BEING_LOOKS_CHANGE       = 0x0210, // W weapon, W hat, W top clothes, W bottom clothes

+    GPMSG_BEING_LOOKS_CHANGE       = 0x0210, // B sprite layers changed, { B slot type, W item id }*

     PGMSG_WALK                     = 0x0260, // W*2 destination

     PGMSG_ACTION_CHANGE            = 0x0270, // B Action

     GPMSG_BEING_ACTION_CHANGE      = 0x0271, // W being id, B action

@@ -426,23 +426,6 @@ enum BeingDirection
     RIGHT = 8

 };

 

-/**

-  * enum for sprites layers.

-  * WARNING: Has to be in sync with the same enum in the Sprite class

-  * of the client!

-  */

-enum SpriteLayer

-{

-    SPRITE_BASE = 0,

-    SPRITE_SHOE,

-    SPRITE_BOTTOMCLOTHES,

-    SPRITE_TOPCLOTHES,

-    SPRITE_HAIR,

-    SPRITE_HAT,

-    SPRITE_WEAPON,

-    SPRITE_VECTOREND

-};

-

 } // namespace ManaServ

 

 #endif // MANASERV_PROTOCOL_H