summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 20:06:19 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 20:06:19 +0000
commit05cb73e9caeddfb27729ad1d1652bb7bbfeba27e (patch)
tree461354e8b243b3d013a368a881ef466d4281d40c /src/map/battle.c
parent586c00b494f31c40c337654d658ff60086ba2ca0 (diff)
downloadhercules-05cb73e9caeddfb27729ad1d1652bb7bbfeba27e.tar.gz
hercules-05cb73e9caeddfb27729ad1d1652bb7bbfeba27e.tar.bz2
hercules-05cb73e9caeddfb27729ad1d1652bb7bbfeba27e.tar.xz
hercules-05cb73e9caeddfb27729ad1d1652bb7bbfeba27e.zip
- Re-fixed the attack_attr_none setting x_X
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10129 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index d3473872a..f758c3914 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1816,8 +1816,8 @@ static struct Damage battle_calc_weapon_attack(
if(skill_num==TF_POISON)
ATK_ADD(15*skill_lv);
- if (!(nk&NK_NO_ELEFIX) ||
- (s_ele == ELE_NEUTRAL && !(battle_config.attack_attr_none&src->type)))
+ if(!(nk&NK_NO_ELEFIX || (s_ele == ELE_NEUTRAL &&
+ battle_config.attack_attr_none&src->type)))
{ //Elemental attribute fix
if (wd.damage > 0)
{