summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 14:19:55 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 14:19:55 +0000
commit0a40ae70878e56aa44ee7b2773f9cd6cf21981fb (patch)
tree9be181b20c263cc1bdf5073307c361571e065854 /src/map/battle.c
parent37cc17c1b9a2dd29e1623a46cfc332e1aeb76751 (diff)
downloadhercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.tar.gz
hercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.tar.bz2
hercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.tar.xz
hercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.zip
- Corrected the login TXT server not initializing the waiting_disconnect variable.
- Corrected the attack_attr_none check being backwards. - All pets can now move regardless of their Mob counter part setting. - Added hom_setting&0x40, when set it clears the "can't reuse" skill delay when you vaporize a homunculus (set by default). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10120 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 596cdc55d..d3473872a 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1817,7 +1817,7 @@ static struct Damage battle_calc_weapon_attack(
ATK_ADD(15*skill_lv);
if (!(nk&NK_NO_ELEFIX) ||
- (s_ele == ELE_NEUTRAL && (battle_config.attack_attr_none&src->type)))
+ (s_ele == ELE_NEUTRAL && !(battle_config.attack_attr_none&src->type)))
{ //Elemental attribute fix
if (wd.damage > 0)
{