Browse Source

- 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://svn.code.sf.net/p/rathena/svn/trunk@5960 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 years ago
parent
commit
1f0de23255
2 changed files with 4 additions and 1 deletions
  1. 3 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/skill.c

+ 3 - 0
Changelog-Trunk.txt

@@ -4,6 +4,9 @@ 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/04/08
+	* 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.
+	  [Skotlex]
 	* Fixed @movenpc [Skotlex]
 	* Cleaned up and improved the lootsearch routine to pick nearest item.
 	  [Skotlex]

+ 1 - 1
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);