diff options
| author | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-21 10:41:37 +0000 |
|---|---|---|
| committer | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-21 10:41:37 +0000 |
| commit | 31ad1a39db0aa488dd5a96e54d842b89a46eb129 (patch) | |
| tree | bb7d053556c661ecb60c9728b84e08fc966d818d /src/map/mercenary.h | |
| parent | 7cb15efd94f0b12cd269862888be653def1e3633 (diff) | |
| download | hercules-31ad1a39db0aa488dd5a96e54d842b89a46eb129.tar.gz hercules-31ad1a39db0aa488dd5a96e54d842b89a46eb129.tar.bz2 hercules-31ad1a39db0aa488dd5a96e54d842b89a46eb129.tar.xz hercules-31ad1a39db0aa488dd5a96e54d842b89a46eb129.zip | |
Fixed bugreport:6044 mercenaries should warp after being far from the master after 3 seconds.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16327 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.h')
| -rw-r--r-- | src/map/mercenary.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h index f63ffad86..402a4e0ab 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -46,6 +46,7 @@ struct mercenary_data { int contract_timer; unsigned devotion_flag : 1; + unsigned int masterteleport_timer; }; bool merc_class(int class_); |