diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-15 02:28:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-15 02:28:24 +0300 |
| commit | 94df0300da69e3dde9bc05f32137dd90c43040e8 (patch) | |
| tree | 53b540f7483533a281ffb66e0c39765a8f65508a /src/map/mercenary.h | |
| parent | 6795414243a08d47bc111e23c9c0f09218260ccf (diff) | |
| parent | d95f3b14d78305ea48834212684c73086555f74f (diff) | |
| download | hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.gz hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.bz2 hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.xz hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.zip | |
Merge pull request #643 from HerculesWS/hpmfixes_v2
HPM Compatibility Improvements
Diffstat (limited to 'src/map/mercenary.h')
| -rw-r--r-- | src/map/mercenary.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h index c96b5a5ef..9e0c59428 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -6,7 +6,7 @@ #include "map/status.h" // struct status_data, struct status_change #include "map/unit.h" // struct unit_data -#include "common/cbasetypes.h" +#include "common/hercules.h" struct map_session_data; @@ -97,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 */ |