summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-23 03:25:33 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-23 03:25:33 +0000
commitd5ed6070886bb3dc2d15c7cc69950762f7f885f1 (patch)
treed8e0bdcffd24290695a509d590ab0d523544b364 /src/map/battle.c
parenta4238c21464e3bf61150795d49f9478293cae586 (diff)
downloadhercules-d5ed6070886bb3dc2d15c7cc69950762f7f885f1.tar.gz
hercules-d5ed6070886bb3dc2d15c7cc69950762f7f885f1.tar.bz2
hercules-d5ed6070886bb3dc2d15c7cc69950762f7f885f1.tar.xz
hercules-d5ed6070886bb3dc2d15c7cc69950762f7f885f1.zip
Splash attacks do cause additional effects except for autocasts. (bugreport:2661)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13804 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 410413e7b..fb3bb0e25 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -939,7 +939,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
wd.dmotion=tstatus->dmotion;
wd.blewcount=skill_get_blewcount(skill_num,skill_lv);
wd.flag = BF_WEAPON; //Initial Flag
- wd.flag|= skill_num?BF_SKILL:BF_NORMAL;
+ wd.flag |= (skill_num||wflag)?BF_SKILL:BF_NORMAL; // Baphomet card's splash damage is counted as a skill. [Inkfish]
wd.dmg_lv=ATK_DEF; //This assumption simplifies the assignation later
nk = skill_get_nk(skill_num);
flag.hit = nk&NK_IGNORE_FLEE?1:0;