summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-07-11 20:56:11 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2013-07-11 20:56:11 +0800
commit444835e777fbe49959ee8fe99746955018ec45eb (patch)
treedd9cb494c0434aed0fcd4c41cf42decb2bb1316a /src/map/battle.c
parent1708b62c12693cf55cdb97092ec7ec6692e8e272 (diff)
downloadhercules-444835e777fbe49959ee8fe99746955018ec45eb.tar.gz
hercules-444835e777fbe49959ee8fe99746955018ec45eb.tar.bz2
hercules-444835e777fbe49959ee8fe99746955018ec45eb.tar.xz
hercules-444835e777fbe49959ee8fe99746955018ec45eb.zip
Fixed Bug#7498
-Where RE equip atk doesn't properly update status window and negative equip atk should now affect atk. Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 135247734..2016efa3b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -444,8 +444,8 @@ int battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, uin
if( flag&2 && sd->bonus.arrow_atk )
damage += sd->bonus.arrow_atk;
- if( sd->bonus.eatk > 0 )
- eatk = sd->bonus.eatk;
+ if( sd->battle_status.equip_atk != 0 )
+ eatk = sd->base_status.equip_atk;
}
if( sc && sc->count ){