diff options
| author | Haru <haru@dotalux.com> | 2017-05-27 19:24:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 19:24:42 +0200 |
| commit | cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2 (patch) | |
| tree | 1b1df55f4143bae6bed85093f3424b6af11e4a01 /src/common | |
| parent | be118c7fad6df29dc691452ef511ac12fea37a06 (diff) | |
| parent | d966a8e6860d418bb3a235e57928436127eba555 (diff) | |
| download | hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.tar.gz hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.tar.bz2 hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.tar.xz hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.zip | |
Merge pull request #1722 from Smokexyz/mmo_charstatus-fix
Dismemberment of `storage_data` from `mmo_charstatus`.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/mmo.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 7bd5b7c06..276e0eb08 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -23,6 +23,7 @@ #include "config/core.h" #include "common/cbasetypes.h" +#include "common/db.h" // VECTORS // server->client protocol version // 0 - pre-? @@ -480,8 +481,10 @@ struct status_change_data { }; struct storage_data { - int storage_amount; - struct item items[MAX_STORAGE]; + bool save; ///< save flag. + bool received; ///< received flag. + int aggregate; ///< total item count. + VECTOR_DECL(struct item) item; ///< item vector. }; struct guild_storage { @@ -617,7 +620,6 @@ struct mmo_charstatus { struct point last_point,save_point,memo_point[MAX_MEMOPOINTS]; struct item inventory[MAX_INVENTORY],cart[MAX_CART]; - struct storage_data storage; struct s_skill skill[MAX_SKILL]; struct s_friend friends[MAX_FRIENDS]; //New friend system [Skotlex] |