summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2015-03-15 07:30:50 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2015-03-15 07:30:50 +0800
commit51445eeb902f9b798e62635c44bac329f2a20c43 (patch)
tree4fdd7d1ed8fa56c4df1b7c1569705e9f4e152bf1 /src/map
parent776aabcba6a61e15c64c93f5bb0ecb65c6c77c94 (diff)
downloadhercules-51445eeb902f9b798e62635c44bac329f2a20c43.tar.gz
hercules-51445eeb902f9b798e62635c44bac329f2a20c43.tar.bz2
hercules-51445eeb902f9b798e62635c44bac329f2a20c43.tar.xz
hercules-51445eeb902f9b798e62635c44bac329f2a20c43.zip
Fixed Bug#8569
-http://hercules.ws/board/tracker/issue-8569-asura-strike/?gopid=24715#entry24715 Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index e4f4e6679..f9472692e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5273,6 +5273,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
ATK_ADD(10*sd->status.inventory[index].refine);
}
}
+ //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);
+ }
#endif
if( flag.infdef ) { //Plants receive 1 damage when hit