summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-23 03:22:57 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-23 03:22:57 +0000
commit49ebf878dfb1301fe86d490bab59811c0632e716 (patch)
treeade0a6658743332fec87c124f7af2a242d42f148 /src
parent3145ee52536bf79a9c2e540fe7cf668204588348 (diff)
downloadhercules-49ebf878dfb1301fe86d490bab59811c0632e716.tar.gz
hercules-49ebf878dfb1301fe86d490bab59811c0632e716.tar.bz2
hercules-49ebf878dfb1301fe86d490bab59811c0632e716.tar.xz
hercules-49ebf878dfb1301fe86d490bab59811c0632e716.zip
Fixed bugreport:5411 Shield Bommerang (Rapid Smitting), in renewal now takes weapon in account plus it weapon element (no longer forced-neutral).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15768 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 576c88f78..95756c2f7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1241,8 +1241,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
//Since these do not consume ammo, they need to be explicitly set as arrow attacks.
flag.arrow = 1;
break;
-
+#if isOFF(REMODE)
case CR_SHIELDBOOMERANG:
+#endif
case PA_SHIELDCHAIN:
case LG_SHIELDPRESS:
case LG_EARTHDRIVE: