summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
authorpanikon <panikon@zoho.com>2014-05-10 06:08:56 -0300
committerpanikon <panikon@zoho.com>2014-05-10 06:08:56 -0300
commit94657284973f4037596bae468ebfbee5c217e02b (patch)
treec99c1e3a39ad41183f2d70eb093df54ca60ad0fb /src/map/mercenary.h
parenta1eba2e076401ddbc34e5a65e15bb0f418591b1a (diff)
downloadhercules-94657284973f4037596bae468ebfbee5c217e02b.tar.gz
hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.bz2
hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.xz
hercules-94657284973f4037596bae468ebfbee5c217e02b.zip
Revert "Fixed order of includes in all source files"
This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3. Fixes issue 8184 http://hercules.ws/board/tracker/issue-8184-cart-related/
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index b998ac006..dd9266b2e 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -6,7 +6,6 @@
#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