From 9bf4c93d86a081c0c1254613d5115e8210e035ec Mon Sep 17 00:00:00 2001 From: zephyrus Date: Sun, 24 Aug 2008 22:45:32 +0000 Subject: - Implemented Mercenary Scrolls (item_db) - There are some little problems, like remaining time going to 0, but you can summon it, make it walk, follow you. - Feel free to test it. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13126 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/unit.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d5c452148..6299175d6 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1258,9 +1258,8 @@ int unit_attack(struct block_list *src,int target_id,int continuous) } } - if(battle_check_target(src,target,BCT_ENEMY)<=0 || - !status_check_skilluse(src, target, 0, 0) - ) { + if( battle_check_target(src,target,BCT_ENEMY) <= 0 || !status_check_skilluse(src, target, 0, 0) ) + { unit_unattackable(src); return 1; } @@ -2065,7 +2064,6 @@ int unit_free(struct block_list *bl, int clrtype) { struct homun_data *hd = (TBL_HOM*)bl; struct map_session_data *sd = hd->master; - // Desactive timers merc_hom_hungry_timer_delete(hd); if( clrtype >= 0 ) { @@ -2086,7 +2084,6 @@ int unit_free(struct block_list *bl, int clrtype) { struct mercenary_data *md = (TBL_MER*)bl; struct map_session_data *sd = md->master; - /* Stop Mercenary Timer */ if( clrtype >= 0 ) { if( md->mercenary.remain_life_time > 0 ) -- cgit v1.2.3-60-g2f50