diff options
| author | Haru <haru@dotalux.com> | 2016-02-20 03:00:09 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-03-20 18:32:07 +0100 |
| commit | 13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8 (patch) | |
| tree | 28d87e3e5219d5beb5e2dcf0f714e27184818940 /src/map/pc.h | |
| parent | 68c5122499f0cc2f4ce224c1ac82b6ec47d6abbe (diff) | |
| download | hercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.tar.gz hercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.tar.bz2 hercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.tar.xz hercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.zip | |
Dropped typedefs from union DBKey and struct DBData
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 5c5ec131d..728d02734 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -33,8 +33,9 @@ #include "map/status.h" // enum sc_type, OPTION_* #include "map/unit.h" // struct unit_data, struct view_data #include "map/vending.h" // struct s_vending -#include "common/hercules.h" +#include "common/db.h" #include "common/ers.h" // struct eri +#include "common/hercules.h" #include "common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus, NEW_CARTS /** @@ -1084,7 +1085,7 @@ END_ZEROED_BLOCK; /* End */ void (*autotrade_start) (struct map_session_data *sd); void (*autotrade_prepare) (struct map_session_data *sd); void (*autotrade_populate) (struct map_session_data *sd); - int (*autotrade_final) (DBKey key, DBData *data, va_list ap); + int (*autotrade_final) (union DBKey key, struct DBData *data, va_list ap); int (*check_job_name) (const char *name); void (*update_idle_time) (struct map_session_data* sd, enum e_battle_config_idletime type); |