diff options
Diffstat (limited to 'src/map/mercenary.h')
| -rw-r--r-- | src/map/mercenary.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h index fbf3603f6..9e0c59428 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -4,9 +4,11 @@ #ifndef MAP_MERCENARY_H #define MAP_MERCENARY_H -#include "status.h" // struct status_data, struct status_change -#include "unit.h" // struct unit_data -#include "../common/cbasetypes.h" +#include "map/status.h" // struct status_data, struct status_change +#include "map/unit.h" // struct unit_data +#include "common/hercules.h" + +struct map_session_data; // number of cells that a mercenary can walk to from it's master before being warped #define MAX_MER_DISTANCE 15 @@ -56,7 +58,7 @@ struct mercenary_interface { /* vars */ - struct s_mercenary_db db[MAX_MERCENARY_CLASS]; + struct s_mercenary_db *db; /* funcs */ @@ -95,10 +97,10 @@ struct mercenary_interface { bool (*read_skill_db_sub) (char* str[], int columns, int current); }; -struct mercenary_interface *mercenary; - #ifdef HERCULES_CORE void mercenary_defaults(void); #endif // HERCULES_CORE +HPShared struct mercenary_interface *mercenary; + #endif /* MAP_MERCENARY_H */ |