summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-03 00:18:49 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-03 00:18:49 +0000
commit2596009d03fe616ef9fd8b94367bd197a4a34249 (patch)
tree86ca2d9de6c8a7a1e0af924cb24df898f22460c7 /src/map/battle.c
parentd2f27c0797129497441a47fbb04e0f033fdd341d (diff)
downloadhercules-2596009d03fe616ef9fd8b94367bd197a4a34249.tar.gz
hercules-2596009d03fe616ef9fd8b94367bd197a4a34249.tar.bz2
hercules-2596009d03fe616ef9fd8b94367bd197a4a34249.tar.xz
hercules-2596009d03fe616ef9fd8b94367bd197a4a34249.zip
Fixed bugreport:5500 / Follow up r15768
Shield Chain now takes account of weapon attack and weapon refinement into damage, along with elemental weapons. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15826 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 8f793c4e4..ef64469b7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1242,9 +1242,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
flag.arrow = 1;
break;
#if isOFF(REMODE)
+ case PA_SHIELDCHAIN:
case CR_SHIELDBOOMERANG:
#endif
- case PA_SHIELDCHAIN:
case LG_SHIELDPRESS:
case LG_EARTHDRIVE:
flag.weapon = 0;