summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-05 19:53:14 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-05 19:53:14 +0000
commit961c1f83daaceecd086816d6fd7a0968c61ec250 (patch)
tree7040ea2defa50f26660a0d1b1df5ec122e35d1a7
parent0fb0df3a0fa3ac24f9f068d0c1ac664beec03354 (diff)
downloadhercules-961c1f83daaceecd086816d6fd7a0968c61ec250.tar.gz
hercules-961c1f83daaceecd086816d6fd7a0968c61ec250.tar.bz2
hercules-961c1f83daaceecd086816d6fd7a0968c61ec250.tar.xz
hercules-961c1f83daaceecd086816d6fd7a0968c61ec250.zip
- Fixed status change resistance not being invoked at all for pretty much all cases.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8641 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/status.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 68d61111d..41c72d498 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/09/05
+ * Fixed status change resistance not being invoked at all for pretty much
+ all cases. [Skotlex]
* Corrected SC_INTRAVISION not starting. [Skotlex]
* Fixed crash when attempting to read a Label as a string on a script
(thanks to End of Exam) [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c
index 65fcf8f12..9a95776dd 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4444,7 +4444,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
//Check rate
if (!(flag&(1|4))) {
- int def = flag&(2|8)?status_get_sc_def(bl, type):0;
+ int def = status_get_sc_def(bl, type);
if (def && !(flag&8))
rate -= rate*def/10000;