diff options
| author | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
| commit | 61f0dcb9a812d057e28c53837327f99bcea4733e (patch) | |
| tree | 76c299f94ef60fa6007321b8c403ebc93d8027c1 /src/map/mercenary.h | |
| parent | ec7241c953392938cd3a8740bacb4c869636766f (diff) | |
| parent | f2fbdc16a14d07e0895cc09eeba689bc556481d2 (diff) | |
| download | hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.gz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.bz2 hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.xz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.zip | |
Merge pull request #532 from MishimaHaruna/includes
Include paths
Diffstat (limited to 'src/map/mercenary.h')
| -rw-r--r-- | src/map/mercenary.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h index fbf3603f6..29a2c6ba0 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/cbasetypes.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 |