diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:48:23 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:48:23 +0200 |
commit | a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c (patch) | |
tree | 3ec5f5d2452205259789a5106df53c0002a586b8 /src/game-server/item.h | |
parent | 70f3c0e3d530304b1b1162b1bdc6c1177522b7ff (diff) | |
parent | 2a581a0f65f4a381a76590be0f8a6e1048347177 (diff) | |
download | manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.gz manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.bz2 manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.xz manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.zip |
Merge git://gitorious.org/~bertram/mana/manaserv-equipment-fix into equipment-fix
Conflicts:
example/serverdata/scripts/maps/desert.lua
Diffstat (limited to 'src/game-server/item.h')
-rw-r--r-- | src/game-server/item.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/game-server/item.h b/src/game-server/item.h index caef386a..f7c380f1 100644 --- a/src/game-server/item.h +++ b/src/game-server/item.h @@ -28,10 +28,15 @@ class Being; class Script; -// A pair indicating: Equipment slot id -> how much slots required. -typedef std::pair< unsigned int, unsigned int> ItemEquipInfo; -// The list of required slots to equip. -typedef std::list< ItemEquipInfo > ItemEquipsInfo; +// Indicates the equip slot "cost" to equip an item. +struct ItemEquipRequirement { + ItemEquipRequirement(): + equipSlotId(0), + capacityRequired(0) + {} + + unsigned int equipSlotId, capacityRequired; +}; /** * State effects to beings, and actors. @@ -226,9 +231,10 @@ class ItemClass { return mSpriteID; } /** - * Returns equip requirements. + * Returns equip requirement. */ - const ItemEquipsInfo &getItemEquipData() const { return mEquip; } + const ItemEquipRequirement &getItemEquipRequirement() const + { return mEquipReq; } private: /** @@ -274,12 +280,9 @@ class ItemClass std::multimap< ItemTriggerType, ItemEffectInfo * > mDispells; /** - * List of list of requirements for equipping. Only one inner list - * need be satisfied to sucessfully equip. Checks occur in order - * from outer front to back. - * All conditions in an inner list must be met for success. + * Requirement for equipping. */ - ItemEquipsInfo mEquip; + ItemEquipRequirement mEquipReq; friend class ItemManager; }; |