- Fixed wrong check of Deluge + Suiton which broke the water-requirement check for skills.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6103 54d463be-8e91-2dee-dedb-b68131a5f0ec

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/04/16
+	* Fixed wrong check of Deluge + Suiton which broke the water-requirement
+	  check for skills. [Skotlex\
 	* Cleared ud->target on remove-map, it should fix the phantom mob sprite
 	  issue. [Skotlex]
 	* Temperory fixed compiler warnings/errors. Please compile before commiting.

src/map/skill.c

@@ -8223,7 +8223,7 @@ int skill_check_condition(struct map_session_data *sd,int skill, int lv, int typ
 	case ST_WATER:
 		//?…?ê”»’è
 		//(!map[sd->bl.m].flag.rain) && //they have removed RAIN effect. [Lupus]
-		if ( (sd->sc.data[SC_DELUGE].timer == -1 || sd->sc.data[SC_SUITON].timer == -1) &&
+		if (sd->sc.data[SC_DELUGE].timer == -1 && sd->sc.data[SC_SUITON].timer == -1 &&
 			(!map_getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKWATER)))
 		{
 			clif_skill_fail(sd,skill,0,0);