summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-08 19:05:21 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-08 19:05:21 +0000
commit215674c27bd3ba99de23c81356a77c94bc967b6a (patch)
treecd6b7a06602042e066ba157781c2a365f3c2cd71 /src
parent2de9fa2b9bcc944a5671a1965813a56b1e1dfd5c (diff)
downloadhercules-215674c27bd3ba99de23c81356a77c94bc967b6a.tar.gz
hercules-215674c27bd3ba99de23c81356a77c94bc967b6a.tar.bz2
hercules-215674c27bd3ba99de23c81356a77c94bc967b6a.tar.xz
hercules-215674c27bd3ba99de23c81356a77c94bc967b6a.zip
- Fixed skill_nocast_db reading so that when the same skill is specified multiple times, the blocked effects add up instead of replacing each other.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5960 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index b94916433..34605d016 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -10991,7 +10991,7 @@ int skill_readdb(void)
i = GD_SKILLRANGEMIN + i - GD_SKILLBASE;
if(i<=0 || i>MAX_SKILL_DB)
continue;
- skill_db[i].nocast=atoi(split[1]);
+ skill_db[i].nocast|=atoi(split[1]);
k++;
}
fclose(fp);