diff options
| author | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
| commit | 080f7a22740225df70a488849587b462a5d6b1a3 (patch) | |
| tree | 0c1dc751af9f06e1ce3729d271de301f78a4e611 /src/map/itemdb.h | |
| parent | 754af15505f32237f8063e51ae9a1cb90788dff4 (diff) | |
| parent | 25e848f1a0f9317d63106cae048a1ef838411cb2 (diff) | |
| download | hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.gz hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.bz2 hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.xz hercules-080f7a22740225df70a488849587b462a5d6b1a3.zip | |
Merge pull request #1 from Earisu/master
updating, with earisu's
Diffstat (limited to 'src/map/itemdb.h')
| -rw-r--r-- | src/map/itemdb.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h index e308b248b..c441de26a 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -66,7 +66,11 @@ enum { ITEMID_CAMOUFLAGE_GENERATOR, ITEMID_HIGH_QUALITY_COOLER, ITEMID_SPECIAL_COOLER, - } mecha_item_list; +} mecha_item_list; + +enum { + NOUSE_SITTING = 0x01, +} item_nouse_list; //The only item group required by the code to be known. See const.txt for the full list. #define IG_FINDINGORE 6 @@ -123,7 +127,6 @@ struct item_data { struct script_code *unequip_script;//Script executed once when unequipping. struct { unsigned available : 1; - short no_equip; unsigned no_refine : 1; // [celest] unsigned delay_consume : 1; // Signifies items that are not consumed immediately upon double-click [Skotlex] unsigned trade_restriction : 9; //Item restrictions mask [Skotlex] @@ -137,6 +140,10 @@ struct item_data { unsigned int storage:1; unsigned int guildstorage:1; } stack; + struct {// used by item_nouse.txt + unsigned int flag; + unsigned short override; + } item_usage; short gm_lv_trade_override; //GM-level to override trade_restriction /* bugreport:309 */ struct item_combo **combos; @@ -156,6 +163,8 @@ struct item_combo { bool isRef;/* whether this struct is a reference or the master */ }; +struct item_group itemgroup_db[MAX_ITEMGROUP]; + struct item_data* itemdb_searchname(const char *name); int itemdb_searchname_array(struct item_data** data, int size, const char *str); struct item_data* itemdb_load(int nameid); @@ -217,6 +226,7 @@ int itemdb_isrestricted(struct item* item, int gmlv, int gmlv2, int (*func)(stru int itemdb_isequip(int); int itemdb_isequip2(struct item_data *); int itemdb_isidentified(int); +int itemdb_isidentified2(struct item_data *data); int itemdb_isstackable(int); int itemdb_isstackable2(struct item_data *); uint64 itemdb_unique_id(int8 flag, int64 value); // Unique Item ID |