diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-09-17 23:49:11 +0200 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-09-17 23:49:11 +0200 |
| commit | 15c8f8d190aae986a5c3c93d482fd9047cdad143 (patch) | |
| tree | dc99c27c2f87ba5d1485a16a3b17a2f2efe53e6c /src/map/skill.c | |
| parent | ddc52570a9bf694cdba6445bc02350a94856a583 (diff) | |
| parent | 964b47351ef2156423f6e0a68bfd3361283936c1 (diff) | |
| download | hercules-15c8f8d190aae986a5c3c93d482fd9047cdad143.tar.gz hercules-15c8f8d190aae986a5c3c93d482fd9047cdad143.tar.bz2 hercules-15c8f8d190aae986a5c3c93d482fd9047cdad143.tar.xz hercules-15c8f8d190aae986a5c3c93d482fd9047cdad143.zip | |
Merge pull request #357 from csnv/master
Devotion statuses fixed. Cleaned some warnings. Unit range shortened!
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 6d4d9ef1b..814fb1999 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1733,7 +1733,7 @@ int skill_counter_additional_effect(struct block_list* src, struct block_list *b case LG_HESPERUSLIT: if ( sc && sc->data[SC_FORCEOFVANGUARD] && sc->data[SC_BANDING] && sc->data[SC_BANDING]->val2 > 6 ) { char i; - for( i = 0; i < sc->data[SC_FORCEOFVANGUARD]->val3; i++ && sc->fv_counter <= sc->data[SC_FORCEOFVANGUARD]->val3 ) + for( i = 0; i < sc->data[SC_FORCEOFVANGUARD]->val3 && sc->fv_counter <= sc->data[SC_FORCEOFVANGUARD]->val3 ; i++) clif->millenniumshield(bl, sc->fv_counter++); } break; @@ -1768,15 +1768,12 @@ int skill_counter_additional_effect(struct block_list* src, struct block_list *b if( attack_type&BF_MAGIC ) { sp += sd->bonus.magic_sp_gain_value; hp += sd->bonus.magic_hp_gain_value; - if( skill_id == WZ_WATERBALL ) {// (bugreport:5303) - struct status_change *sc = NULL; - if( ( sc = status->get_sc(src) ) ) { - if( sc->data[SC_SOULLINK] - && sc->data[SC_SOULLINK]->val2 == SL_WIZARD - && sc->data[SC_SOULLINK]->val3 == WZ_WATERBALL - ) - sc->data[SC_SOULLINK]->val3 = 0; //Clear bounced spell check. - } + if( skill_id == WZ_WATERBALL ) {// (bugreport:5303) + if( sc->data[SC_SOULLINK] + && sc->data[SC_SOULLINK]->val2 == SL_WIZARD + && sc->data[SC_SOULLINK]->val3 == WZ_WATERBALL + ) + sc->data[SC_SOULLINK]->val3 = 0; //Clear bounced spell check. } } if( hp || sp ) { @@ -11866,7 +11863,7 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 if( md && md->class_ == MOBID_EMPERIUM ) break; #endif - if( sg->src_id == bl->id && !(tsc && tsc->data[SC_SOULLINK] && tsc->data[SC_SOULLINK]->val2 == SL_BARDDANCER) + if( (sg->src_id == bl->id && !(tsc && tsc->data[SC_SOULLINK] && tsc->data[SC_SOULLINK]->val2 == SL_BARDDANCER)) || (!(battle_config.song_timer_reset) && tsc && tsc->data[type] && tsc->data[type]->val4 == 1)) break; heal = skill->calc_heal(ss,bl,sg->skill_id, sg->skill_lv, true); |