diff options
| author | jaBote <j@bot.e> | 2013-05-03 01:45:50 +0200 |
|---|---|---|
| committer | jaBote <j@bot.e> | 2013-05-03 01:45:50 +0200 |
| commit | 1e5e8f5f42abb2cd42ad7ecf8e07439b8a1c570b (patch) | |
| tree | c8825cc2dc141d91fe1fcc52739a0e79a89c80e9 /src/map/itemdb.h | |
| parent | f41dea469a52213acfde4f4ea5e8d7bbbd869bed (diff) | |
| parent | 274bfc3b06616ea03c467d8eed23fae61c72fe18 (diff) | |
| download | hercules-1e5e8f5f42abb2cd42ad7ecf8e07439b8a1c570b.tar.gz hercules-1e5e8f5f42abb2cd42ad7ecf8e07439b8a1c570b.tar.bz2 hercules-1e5e8f5f42abb2cd42ad7ecf8e07439b8a1c570b.tar.xz hercules-1e5e8f5f42abb2cd42ad7ecf8e07439b8a1c570b.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/itemdb.h')
| -rw-r--r-- | src/map/itemdb.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 362b42cff..c441de26a 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -68,6 +68,10 @@ enum { ITEMID_SPECIAL_COOLER, } 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 #define IG_POTION 37 @@ -136,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; |