diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-20 14:59:16 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-20 14:59:16 +0000 |
commit | f3e0608b8871675ec21c8da90ea3ca545f54e017 (patch) | |
tree | 3935b91700738cf8c7044afdbc094f2ed02ecee2 /src/map/skill.c | |
parent | cc0055f1af5eea3a9253cf3e0e0582f19ea8b512 (diff) | |
download | hercules-f3e0608b8871675ec21c8da90ea3ca545f54e017.tar.gz hercules-f3e0608b8871675ec21c8da90ea3ca545f54e017.tar.bz2 hercules-f3e0608b8871675ec21c8da90ea3ca545f54e017.tar.xz hercules-f3e0608b8871675ec21c8da90ea3ca545f54e017.zip |
- Removed Magic Rod's cast bar.
- Corrected warning on login sql.
- Gravitation no longer causes damage flinch.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10038 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 861c33e87..bc00db58c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -812,7 +812,6 @@ int skill_calc_heal (struct block_list *bl, int skill_lv) if(bl->type == BL_HOM && (skill = merc_hom_checkskill(((TBL_HOM*)bl), HLIF_BRAIN)) > 0) heal += heal * skill * 2 / 100; - return heal; } @@ -5711,10 +5710,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) if (ud->walktimer != -1 && ud->skillid != TK_RUN) unit_stop_walking(src,1); - if (ud->skillid == SA_MAGICROD) - ud->canact_tick = tick; - else - ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv); + ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv); if (skill_get_state(ud->skillid) != ST_MOVE_ENABLE) unit_set_walkdelay(src, tick, battle_config.default_skill_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1); |