summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 23:26:14 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 23:26:14 +0000
commit08d3a24b80ebb31e46d623118b335a86cf37f425 (patch)
tree2b8e049aedd4a720aafc395a30983206f3e6292e /src/map/mercenary.c
parent9bf4c93d86a081c0c1254613d5115e8210e035ec (diff)
downloadhercules-08d3a24b80ebb31e46d623118b335a86cf37f425.tar.gz
hercules-08d3a24b80ebb31e46d623118b335a86cf37f425.tar.bz2
hercules-08d3a24b80ebb31e46d623118b335a86cf37f425.tar.xz
hercules-08d3a24b80ebb31e46d623118b335a86cf37f425.zip
- Mercenary Dismiss packet and some corrections.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13127 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index e324ec7ab..dc49f5e21 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -129,8 +129,7 @@ int merc_delete(struct mercenary_data *md, int reply)
struct map_session_data *sd = md->master;
md->mercenary.remain_life_time = 0;
- if( md->contract_timer != INVALID_TIMER )
- delete_timer(md->contract_timer, merc_contract_end);
+ merc_contract_stop(md);
if( !sd )
return unit_free(&md->bl, 1);
@@ -197,6 +196,7 @@ int merc_data_received(struct s_mercenary *merc, bool flag)
map_addiddb(&md->bl);
status_calc_mercenary(md,1);
md->contract_timer = INVALID_TIMER;
+ merc_contract_init(md);
}
else
memcpy(&sd->md->mercenary, merc, sizeof(struct s_mercenary));
@@ -208,7 +208,6 @@ int merc_data_received(struct s_mercenary *merc, bool flag)
clif_spawn(&md->bl);
clif_mercenary_info(sd);
clif_mercenary_skillblock(sd);
- merc_contract_init(md);
}
return 1;