summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-08 03:42:49 +0000
committershadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-08 03:42:49 +0000
commitc655c830e4ebd114425b5d0d963070bef1051bb2 (patch)
tree61b87da2b4c2a9da2706ccc5d46a7d8cc977bb78
parent8413a07b89dca7851fed0701da452af6f664549c (diff)
downloadhercules-c655c830e4ebd114425b5d0d963070bef1051bb2.tar.gz
hercules-c655c830e4ebd114425b5d0d963070bef1051bb2.tar.bz2
hercules-c655c830e4ebd114425b5d0d963070bef1051bb2.tar.xz
hercules-c655c830e4ebd114425b5d0d963070bef1051bb2.zip
Fixed SA_DISPELL removing SC_CRITICALWOUND.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12781 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/skill.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d672e3dfc..7bd233fa6 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/06/08
+ * Fixed SA_DISPELL removing SC_CRITICALWOUND. [Brainstorm]
+
2008/06/07
* Swapped the W_SHOTGUN and W_GATLING weapon type IDs [ultramage]
* Fixed GD_EMERGENCYCALL not working inside gvg castles when WoE is off, bugreport:1637 fix by Meyraw [Brainstorm]
diff --git a/src/map/skill.c b/src/map/skill.c
index e752afb87..7559c8177 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4236,7 +4236,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case SC_INCHITRATE: case SC_INCATKRATE: case SC_NEN:
case SC_READYSTORM: case SC_READYDOWN: case SC_READYTURN:
case SC_READYCOUNTER:case SC_DODGE: case SC_WARM:
- case SC_SPEEDUP1: case SC_AUTOTRADE:
+ case SC_SPEEDUP1: case SC_AUTOTRADE: case SC_CRITICALWOUND:
continue;
}
if(i==SC_BERSERK) tsc->data[i]->val2=0; //Mark a dispelled berserk to avoid setting hp to 100 by setting hp penalty to 0.