X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FItem.h;h=7e757ff245095e8f55e81b8c4f86d5b32595b450;hb=670dd3c61cba875345b6755d41f479cff8d964c4;hp=eb60891636e9cb22acd87d5867b372d17afc0db8;hpb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;p=l2e.git diff --git a/src/common/Item.h b/src/common/Item.h index eb60891..7e757ff 100644 --- a/src/common/Item.h +++ b/src/common/Item.h @@ -19,6 +19,9 @@ namespace common { class Item { +public: + static const int TYPE_ID = 303; + public: Item(); @@ -26,7 +29,7 @@ public: const char *Name() const { return name; } bool IsMostUseful() const { return mostUseful; } - bool IsEquipable() const { return equipable; } + bool IsEquipable() const { return equipability; } bool IsCursed() const { return cursed; } bool IsFruit() const { return fruit; } bool IsScenario() const { return scenario; } @@ -75,6 +78,8 @@ public: bool HasBattleAnimation() const { return properties & PROPERTY_HAS_BATTLE_ANIMATION; } bool HasIkariEffect() const { return properties & PROPERTY_HAS_IKARI_EFFECT; } + static bool Less(const Item &, const Item &); + // temporary setters public: void SetName(const char *n) { name = n; } @@ -126,12 +131,11 @@ private: Uint16 properties; TargetingMode targettingMode; - Uint8 equipability; + int equipability; HeroGroup equipableBy; // TODO: turn these back into bits as soon as fields are implemented in the loader bool mostUseful; - bool equipable; bool cursed; bool fruit; bool scenario;