diff options
| author | Haru <haru@dotalux.com> | 2018-12-16 19:05:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 19:05:34 +0100 |
| commit | f1f1ef0ff2c9aa7d879df8b959072a7429d2722a (patch) | |
| tree | 11a7121f30031a2a850015eced3803f060514fa3 /src/common/mmo.h | |
| parent | 41d370cd3308be48b4ce00a50ee46515742978b0 (diff) | |
| parent | 4b2e8684a9874ba435197936a4a9220510ff671f (diff) | |
| download | hercules-f1f1ef0ff2c9aa7d879df8b959072a7429d2722a.tar.gz hercules-f1f1ef0ff2c9aa7d879df8b959072a7429d2722a.tar.bz2 hercules-f1f1ef0ff2c9aa7d879df8b959072a7429d2722a.tar.xz hercules-f1f1ef0ff2c9aa7d879df8b959072a7429d2722a.zip | |
Merge pull request #2324 from 4144/updatepackets
Update packets up to 2018-12-12
Diffstat (limited to 'src/common/mmo.h')
| -rw-r--r-- | src/common/mmo.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 9bcf82cc7..4b8f49fa2 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -165,7 +165,22 @@ #endif #define MAX_CARTS (MAX_BASE_CARTS + MAX_CARTDECORATION_CARTS) +#ifndef MAX_INVENTORY +#if PACKETVER_ZERO_NUM >= 20181212 +#define MAX_INVENTORY 200 +#else #define MAX_INVENTORY 100 +#endif // PACKETVER_ZERO_NUM >= 20181212 +#endif // MAX_INVENTORY + +#ifndef FIXED_INVENTORY_SIZE +#define FIXED_INVENTORY_SIZE 100 +#endif + +#if FIXED_INVENTORY_SIZE > MAX_INVENTORY +#error FIXED_INVENTORY_SIZE must be same or smaller than MAX_INVENTORY +#endif + //Max number of characters per account. Note that changing this setting alone is not enough if the client is not hexed to support more characters as well. #if PACKETVER >= 20100413 #ifndef MAX_CHARS @@ -710,6 +725,7 @@ struct mmo_charstatus { int64 last_login; struct point last_point,save_point,memo_point[MAX_MEMOPOINTS]; + int inventorySize; struct item inventory[MAX_INVENTORY],cart[MAX_CART]; struct s_skill skill[MAX_SKILL_DB]; |