summaryrefslogtreecommitdiff
path: root/src/emap/battle.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emap/battle.c')
-rw-r--r--src/emap/battle.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emap/battle.c b/src/emap/battle.c
index 99dcf36..101e525 100644
--- a/src/emap/battle.c
+++ b/src/emap/battle.c
@@ -94,7 +94,7 @@ struct Damage ebattle_calc_weapon_attack_post(struct Damage retVal,
struct block_list *src,
struct block_list *target,
uint16 skill_id,
- uint16 skill_lv __attribute__ ((unused)),
+ uint16 skill_lv,
int wflag __attribute__ ((unused)))
{
// Rebuild Infinite Defense Rule
@@ -142,8 +142,8 @@ struct Damage ebattle_calc_weapon_attack_post(struct Damage retVal,
int mod = 0;
if (skill_id > 0)
{
- const int idx = skill->get_index(skill_id);
- mod = data->skillAttacks[idx];
+ const int idx = skill->get_ele(skill_id, skill_lv);
+ mod = data->eleResist[idx];
}
else
{
@@ -160,7 +160,7 @@ struct Damage ebattle_calc_magic_attack_post(struct Damage retVal,
struct block_list *src,
struct block_list *target,
uint16 skill_id,
- uint16 skill_lv __attribute__ ((unused)),
+ uint16 skill_lv,
int mflag __attribute__ ((unused)))
{
// Skip if things went wrong
@@ -257,8 +257,8 @@ struct Damage ebattle_calc_magic_attack_post(struct Damage retVal,
int mod = 0;
if (skill_id > 0)
{
- const int idx = skill->get_index(skill_id);
- mod = data->skillAttacks[idx];
+ const int idx = skill->get_ele(skill_id, skill_lv);
+ mod = data->eleResist[idx];
}
else
{