summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-07-08 12:20:33 -0300
committershennetsind <ind@henn.et>2013-07-08 12:20:33 -0300
commitc1e0aab06dfad78c28aff1a4ddc60d599d96d223 (patch)
tree54a179ee67df93a3c9e57f0b46cbe2e10fdaf65f
parentf409afc22eb2d561e9eedcb238aa624ad7e80f4e (diff)
parentc6351f0b3d148169d0ecc00c938376c5b8225532 (diff)
downloadhercules-c1e0aab06dfad78c28aff1a4ddc60d599d96d223.tar.gz
hercules-c1e0aab06dfad78c28aff1a4ddc60d599d96d223.tar.bz2
hercules-c1e0aab06dfad78c28aff1a4ddc60d599d96d223.tar.xz
hercules-c1e0aab06dfad78c28aff1a4ddc60d599d96d223.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-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 b25971c4c..d90ba5e0c 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -461,7 +461,7 @@ int battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, uin
}
// Temporary. [malufett]
- damage = battle->calc_elefix(src, bl, skill_id, skill_lv, damage, nk, n_ele, s_ele, s_ele_, type == EQI_HAND_L, flag);
+ damage = battle->calc_elefix(src, bl, skill_id, skill_lv, damage + eatk, nk, n_ele, s_ele, s_ele_, type == EQI_HAND_L, flag);
/**
* In RE Shield Bommerang takes weapon element only for damage calculation,