diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-29 22:51:31 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-29 22:51:31 +0000 |
| commit | a75f13f9a36ad91cf2fd07257beccbf5bd189c75 (patch) | |
| tree | c52640d4dff0c8c127bc907fffeadace27882bc6 /src/map/battle.c | |
| parent | 863e194ec315b6b45dd0862654359a8f6283f699 (diff) | |
| download | hercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.tar.gz hercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.tar.bz2 hercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.tar.xz hercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.zip | |
Fixed SC_BURNING icon not going off after it was over;
Fixed SC_BURNING from making character unable to move/cast skills/use items/etc, bugreport:5174
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15328 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index fdb67ae3e..3fe4a23b0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -428,7 +428,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag return 0; } - if(sc->data[SC_DODGE] && !sc->opt1 && + if(sc->data[SC_DODGE] && ( !sc->opt1 || sc->opt1 == OPT1_BURNING ) && (flag&BF_LONG || sc->data[SC_SPURT]) && rand()%100 < 20) { if (sd && pc_issit(sd)) pc_setstand(sd); //Stand it to dodge. @@ -1302,7 +1302,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo flag.hit = 1; break; } - if (tsc && !flag.hit && tsc->opt1 && tsc->opt1 != OPT1_STONEWAIT) + if (tsc && !flag.hit && tsc->opt1 && tsc->opt1 != OPT1_STONEWAIT && tsc->opt1 != OPT1_BURNING) flag.hit = 1; } @@ -3366,7 +3366,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * { struct status_change *sc = status_get_sc(target); i = 0; //Temp for "hit or no hit" - if(sc && sc->opt1 && sc->opt1 != OPT1_STONEWAIT) + if(sc && sc->opt1 && sc->opt1 != OPT1_STONEWAIT && sc->opt1 != OPT1_BURNING) i = 1; else { short |