summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
authorepoque11 <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 16:18:36 +0000
committerepoque11 <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 16:18:36 +0000
commit6c066dc648e82dda2a41c596158adbf58ceda68b (patch)
treee4137759c4dc9c73f1d1bb8c00463210c7465f56 /src/map/mercenary.h
parent2ea7dfb95394706661e2bd0295886c7cd5387add (diff)
downloadhercules-6c066dc648e82dda2a41c596158adbf58ceda68b.tar.gz
hercules-6c066dc648e82dda2a41c596158adbf58ceda68b.tar.bz2
hercules-6c066dc648e82dda2a41c596158adbf58ceda68b.tar.xz
hercules-6c066dc648e82dda2a41c596158adbf58ceda68b.zip
- Fixed mercenaries not warping to their master if the master is more than 15 cells away
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15108 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index f040a3913..f63ffad86 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -7,6 +7,9 @@
#include "status.h" // struct status_data, struct status_change
#include "unit.h" // struct unit_data
+// number of cells that a mercenary can walk to from it's master before being warped
+#define MAX_MER_DISTANCE 15
+
enum {
ARCH_MERC_GUILD,
SPEAR_MERC_GUILD,