diff options
| author | MadCamel <madcamel@gmail.com> | 2010-04-04 16:15:43 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2010-04-04 16:15:43 -0400 |
| commit | b683a1ba9ba9e46bab0d8f94e38ef56669f8530a (patch) | |
| tree | c90685468d3a67f4f2dc98d72b1d23d0745ad693 /src/map/battle.c | |
| parent | 3db7c2cd1c4fb0d8888416e9b5733abab574ebe9 (diff) | |
| download | tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.tar.gz tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.tar.bz2 tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.tar.xz tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.zip | |
Fixed some bad code that was generating compiler warnings
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 1cee690..4ec942f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1671,7 +1671,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, { // ボルケーノ if (flag & BF_SKILL && skill_get_pl (skill_num) == 3) damage += damage * sc_data[SC_VOLCANO].val4 / 100; - else if (!flag & BF_SKILL && battle_get_attack_element (bl) == 3) + else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 3)) damage += damage * sc_data[SC_VOLCANO].val4 / 100; } @@ -1679,7 +1679,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, { // バイオレントゲイル if (flag & BF_SKILL && skill_get_pl (skill_num) == 4) damage += damage * sc_data[SC_VIOLENTGALE].val4 / 100; - else if (!flag & BF_SKILL && battle_get_attack_element (bl) == 4) + else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 4)) damage += damage * sc_data[SC_VIOLENTGALE].val4 / 100; } @@ -1687,7 +1687,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, { // デリュージ if (flag & BF_SKILL && skill_get_pl (skill_num) == 1) damage += damage * sc_data[SC_DELUGE].val4 / 100; - else if (!flag & BF_SKILL && battle_get_attack_element (bl) == 1) + else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 1)) damage += damage * sc_data[SC_DELUGE].val4 / 100; } |