diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-24 22:45:32 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-24 22:45:32 +0000 |
| commit | 9bf4c93d86a081c0c1254613d5115e8210e035ec (patch) | |
| tree | 7047ed6cbdfca59eb5860e42dc9a5fbc1c9245c3 /src/map/unit.c | |
| parent | 2600d527592c3e5c6ed6ab827ce69c24f3c6b35b (diff) | |
| download | hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.tar.gz hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.tar.bz2 hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.tar.xz hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.zip | |
- 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
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 7 |
1 files changed, 2 insertions, 5 deletions
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 ) |