summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-09-18 23:35:05 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-09-18 23:35:05 +0200
commitdb3605926534c83c1d1717955a4b55d2d951302f (patch)
tree98e97b9281411ebb75da0269f1d02a9ebad82bef /src/map
parent9a15ccdbfb2c48d6eb73999ad2a61701d7abd6f4 (diff)
parente2cd0bd75b36bb8783b681837b4ff69b7cc29caf (diff)
downloadhercules-db3605926534c83c1d1717955a4b55d2d951302f.tar.gz
hercules-db3605926534c83c1d1717955a4b55d2d951302f.tar.bz2
hercules-db3605926534c83c1d1717955a4b55d2d951302f.tar.xz
hercules-db3605926534c83c1d1717955a4b55d2d951302f.zip
Merge pull request #359 from csnv/somefixes
Follow-up: 9a15ccdbfb2c48d6eb73999ad2a61701d7abd6f4
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 2f53d6423..1ce05158d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5108,7 +5108,6 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
}
#endif
-#ifndef RENEWAL
if (sd) {
if (skill_id != CR_SHIELDBOOMERANG) //Only Shield boomerang doesn't takes the Star Crumbs bonus.
ATK_ADD2(wd.div_*sd->right_weapon.star, wd.div_*sd->left_weapon.star);
@@ -5130,7 +5129,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
ATK_ADD(10*sd->status.inventory[index].refine);
}
}
-#endif
+
//Card Fix, tsd side
if(tsd){ //if player on player then it was already measured above
wd.damage = battle->calc_cardfix(BF_WEAPON, src, target, nk, s_ele, s_ele_, wd.damage, (flag.lh?1:0), wd.flag);