diff options
author | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
---|---|---|
committer | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
commit | 29f4963673b1f793448a083a21be3e6ae4d69c54 (patch) | |
tree | 8722f2e506fc7ba97070a79739f819f0ade4f03d /src/common/HPMDataCheck.h | |
parent | fb82e87c39227921fc3397a8763f0bdb0921a28b (diff) | |
parent | 7b1293c3caf76b5587aa3abe8df57b1083c2175d (diff) | |
download | hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.gz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.bz2 hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.xz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common/HPMDataCheck.h')
-rw-r--r-- | src/common/HPMDataCheck.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h index 43dc9ee5c..be798ceb5 100644 --- a/src/common/HPMDataCheck.h +++ b/src/common/HPMDataCheck.h @@ -301,6 +301,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { { "cdelayed_damage", sizeof(struct cdelayed_damage), SERVER_TYPE_MAP }, { "clif_interface", sizeof(struct clif_interface), SERVER_TYPE_MAP }, { "hCSData", sizeof(struct hCSData), SERVER_TYPE_MAP }, + { "merge_item", sizeof(struct merge_item), SERVER_TYPE_MAP }, { "s_packet_db", sizeof(struct s_packet_db), SERVER_TYPE_MAP }, #else #define MAP_CLIF_H |