diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /src/common/mmo.h | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/common/mmo.h')
| -rw-r--r-- | src/common/mmo.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 7977042d8..9281314dc 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -216,7 +216,7 @@ struct item { int id; short nameid; short amount; - unsigned short equip; // Location(s) where item is equipped (using enum equip_pos for bitmasking). + unsigned int equip; // Location(s) where item is equipped (using enum equip_pos for bitmasking). char identify; char refine; char attribute; @@ -838,6 +838,14 @@ enum ammo_type { A_THROWWEAPON //9 }; +/* packet size constant for itemlist */ +#if MAX_INVENTORY > MAX_STORAGE && MAX_INVENTORY > MAX_CART +#define MAX_ITEMLIST MAX_INVENTORY +#elif MAX_CART > MAX_INVENTORY && MAX_CART > MAX_STORAGE +#define MAX_ITEMLIST MAX_CART +#else +#define MAX_ITEMLIST MAX_STORAGE +#endif // sanity checks... #if MAX_ZENY > INT_MAX |