diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-11 17:11:56 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-11 17:11:56 +0000 |
| commit | c6a57edb3cb1b89ba16fee291fb9344260826570 (patch) | |
| tree | 3dc6ec6c67bbbea335127a91bb54240d376e5565 /src/map/itemdb.h | |
| parent | dbcbf9c883a3bc85c2810dfc88b030a2aa505928 (diff) | |
| download | hercules-c6a57edb3cb1b89ba16fee291fb9344260826570.tar.gz hercules-c6a57edb3cb1b89ba16fee291fb9344260826570.tar.bz2 hercules-c6a57edb3cb1b89ba16fee291fb9344260826570.tar.xz hercules-c6a57edb3cb1b89ba16fee291fb9344260826570.zip | |
Added 2 new item_trade.txt flags as per kenpachi request:
- Item can't be attached to mail
- Item can't be auctioned
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15564 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/itemdb.h')
| -rw-r--r-- | src/map/itemdb.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 52addfb39..9b9ee939f 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -92,7 +92,7 @@ struct item_data { 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 : 7; //Item restrictions mask [Skotlex] + unsigned trade_restriction : 9; //Item restrictions mask [Skotlex] unsigned autoequip: 1; unsigned buyingstore : 1; } flag; @@ -141,6 +141,8 @@ int itemdb_cansell_sub(struct item_data*,int, int); int itemdb_cancartstore_sub(struct item_data*, int, int); int itemdb_canstore_sub(struct item_data*, int, int); int itemdb_canguildstore_sub(struct item_data*, int, int); +int itemdb_canmail_sub(struct item_data*, int, int); +int itemdb_canauction_sub(struct item_data*, int, int); int itemdb_isrestricted(struct item* item, int gmlv, int gmlv2, int (*func)(struct item_data*, int, int)); #define itemdb_isdropable(item, gmlv) itemdb_isrestricted(item, gmlv, 0, itemdb_isdropable_sub) #define itemdb_cantrade(item, gmlv, gmlv2) itemdb_isrestricted(item, gmlv, gmlv2, itemdb_cantrade_sub) @@ -149,6 +151,8 @@ int itemdb_isrestricted(struct item* item, int gmlv, int gmlv2, int (*func)(stru #define itemdb_cancartstore(item, gmlv) itemdb_isrestricted(item, gmlv, 0, itemdb_cancartstore_sub) #define itemdb_canstore(item, gmlv) itemdb_isrestricted(item, gmlv, 0, itemdb_canstore_sub) #define itemdb_canguildstore(item, gmlv) itemdb_isrestricted(item , gmlv, 0, itemdb_canguildstore_sub) +#define itemdb_canmail(item, gmlv) itemdb_isrestricted(item , gmlv, 0, itemdb_canmail_sub) +#define itemdb_canauction(item, gmlv) itemdb_isrestricted(item , gmlv, 0, itemdb_canauction_sub) int itemdb_isequip(int); int itemdb_isequip2(struct item_data *); |