summaryrefslogtreecommitdiff
path: root/src/map/itemdb.h
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-12 16:22:33 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-12 16:22:33 +0000
commita8fe46e2e80ea5b7d998d3e92717153cc3315129 (patch)
treef023f80fd298226e974c34cf595e4e05e4462a9d /src/map/itemdb.h
parent22ea2706f0a9767d9910522868cc90f121cfc6fa (diff)
downloadhercules-a8fe46e2e80ea5b7d998d3e92717153cc3315129.tar.gz
hercules-a8fe46e2e80ea5b7d998d3e92717153cc3315129.tar.bz2
hercules-a8fe46e2e80ea5b7d998d3e92717153cc3315129.tar.xz
hercules-a8fe46e2e80ea5b7d998d3e92717153cc3315129.zip
* Merged /branches/renewal/ r14635 Item Stacking System to /trunk (follow up to r15060) pid:106973
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16279 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/itemdb.h')
-rw-r--r--src/map/itemdb.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 5471fe7e6..539bd2cce 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -125,6 +125,14 @@ struct item_data {
unsigned autoequip: 1;
unsigned buyingstore : 1;
} flag;
+ struct
+ {// item stacking limitation
+ unsigned short amount;
+ unsigned int inventory:1;
+ unsigned int cart:1;
+ unsigned int storage:1;
+ unsigned int guildstorage:1;
+ } stack;
short gm_lv_trade_override; //GM-level to override trade_restriction
};