summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 16:05:45 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 16:05:45 +0000
commitca32e250d3ad395f20a6290f5af7181fdbd5c23e (patch)
treeb6b01e2574dc70665cfe7c509ec88abae08304f3
parentee2c6f31895d4998a5ec2953b08ab27db971dce8 (diff)
downloadhercules-ca32e250d3ad395f20a6290f5af7181fdbd5c23e.tar.gz
hercules-ca32e250d3ad395f20a6290f5af7181fdbd5c23e.tar.bz2
hercules-ca32e250d3ad395f20a6290f5af7181fdbd5c23e.tar.xz
hercules-ca32e250d3ad395f20a6290f5af7181fdbd5c23e.zip
- Added a status_check_skilluse on skill_attack_area call to prevent splash damage skills from hitting hidden/trickdead/etc characters.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7767 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 08a49b8d5..4e4d3f58f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/20
+ * Added a status_check_skilluse on skill_attack_area call to prevent splash
+ damage skills from hitting hidden/trickdead/etc characters. [Skotlex]
* Corrected fog of wall to behave as best known currently: [Skotlex]
- Only takes effect when targetting a character inside it
- -50hit/-75% damage when using normal-ranged attacks
diff --git a/src/map/skill.c b/src/map/skill.c
index 86a94a89d..9f874ed1e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9196,7 +9196,8 @@ int skill_attack_area (struct block_list *bl, va_list ap)
flag=va_arg(ap,int);
type=va_arg(ap,int);
- if(battle_check_target(dsrc,bl,type) > 0)
+ if(battle_check_target(dsrc,bl,type) > 0 &&
+ status_check_skilluse(NULL, bl, skillid, 2)) //also check if they can be hit.
skill_attack(atk_type,src,dsrc,bl,skillid,skilllv,tick,flag);
return 0;