summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index dd9266b2e..270245e96 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -1,11 +1,12 @@
// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
// See the LICENSE file
// Portions Copyright (c) Athena Dev Teams
-#ifndef _MAP_MERCENARY_H_
-#define _MAP_MERCENARY_H_
+#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"
// number of cells that a mercenary can walk to from it's master before being warped
#define MAX_MER_DISTANCE 15
@@ -47,7 +48,7 @@ struct mercenary_data {
};
/*=====================================
-* Interface : mercenary.h
+* Interface : mercenary.h
* Generated by HerculesInterfaceMaker
* created by Susu
*-------------------------------------*/
@@ -98,4 +99,4 @@ struct mercenary_interface *mercenary;
void mercenary_defaults(void);
-#endif /* _MAP_MERCENARY_H_ */
+#endif /* MAP_MERCENARY_H */