diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-03-11 22:22:59 +0100 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-03-14 22:35:09 +0100 |
| commit | 7d70f7ec35b0b4476686b73fc221527a6d1ed0fa (patch) | |
| tree | f8eee25f5412503597e08f6fb2eac0df2a720033 /src/map/battle.c | |
| parent | b151b29cf072ed336214c2d0ca43e6db34a773ad (diff) | |
| download | hercules-7d70f7ec35b0b4476686b73fc221527a6d1ed0fa.tar.gz hercules-7d70f7ec35b0b4476686b73fc221527a6d1ed0fa.tar.bz2 hercules-7d70f7ec35b0b4476686b73fc221527a6d1ed0fa.tar.xz hercules-7d70f7ec35b0b4476686b73fc221527a6d1ed0fa.zip | |
Remove map_session_data->state.autocast and use map_session_data->autocast.type instead
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e73c93bab..6519b1f37 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -5928,17 +5928,10 @@ static void battle_reflect_damage(struct block_list *target, struct block_list * delay += 100;/* gradual increase so the numbers don't clip in the client */ } if( sc->data[SC_LG_REFLECTDAMAGE] && rnd()%100 < (30 + 10*sc->data[SC_LG_REFLECTDAMAGE]->val1) ) { - bool change = false; - NORMALIZE_RDAMAGE(damage * sc->data[SC_LG_REFLECTDAMAGE]->val2 / 100); trdamage -= rdamage;/* wont count towards total */ - if( sd && !sd->state.autocast ) { - change = true; - sd->state.autocast = 1; - } - enum autocast_type ac_type; if (sd != NULL) { @@ -5951,9 +5944,6 @@ static void battle_reflect_damage(struct block_list *target, struct block_list * if (sd != NULL) sd->autocast.type = ac_type; - if( change ) - sd->state.autocast = 0; - delay += 150;/* gradual increase so the numbers don't clip in the client */ if( (--sc->data[SC_LG_REFLECTDAMAGE]->val3) <= 0 ) @@ -6142,7 +6132,7 @@ static int battle_damage_area(struct block_list *bl, va_list ap) else status_fix_damage(src,bl,damage,0); clif->damage(bl,bl,amotion,dmotion,damage,1,BDT_ENDURE,0); - if (src->type != BL_PC || !BL_UCCAST(BL_PC, src)->state.autocast) + if (src->type != BL_PC || BL_UCCAST(BL_PC, src)->autocast.type != AUTOCAST_TEMP) skill->additional_effect(src, bl, CR_REFLECTSHIELD, 1, BF_WEAPON|BF_SHORT|BF_NORMAL,ATK_DEF,tick); map->freeblock_unlock(); } @@ -6466,12 +6456,10 @@ static enum damage_lv battle_weapon_attack(struct block_list *src, struct block_ } } - sd->state.autocast = 1; sd->autocast.type = AUTOCAST_TEMP; skill->consume_requirement(sd,r_skill,r_lv,3); skill->castend_type(type, src, target, r_skill, r_lv, tick, flag); sd->autocast.type = AUTOCAST_NONE; - sd->state.autocast = 0; sd->ud.canact_tick = tick + skill->delay_fix(src, r_skill, r_lv); clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, skill->delay_fix(src, r_skill, r_lv), 0, 0, 1); } |