diff options
| author | shennetsind <ind@henn.et> | 2013-07-11 14:32:05 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-11 14:32:05 -0300 |
| commit | 0a1c06b267e549877e0617fe19963b5b7c8c937c (patch) | |
| tree | 228ab350473b07154d4bcf0ead0d93f163f6d6a8 /src/map/battle.c | |
| parent | e3761a81ba4c941ba04a2b6b1f161a6e1402ebe9 (diff) | |
| parent | 0683c5f38cdefa3735c3d0abc1b74abaa68cf5c4 (diff) | |
| download | hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.tar.gz hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.tar.bz2 hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.tar.xz hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
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 ){ |