diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 07:12:36 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 07:12:36 +0000 |
| commit | 5088312f052d7be173f02945bcf83827aa702833 (patch) | |
| tree | 854f75c8b7441d2586c9aba10d9fdfb60bcdeca0 | |
| parent | 98c8a2359e1fa54ab0826bb626b15d69a48a1258 (diff) | |
| download | hercules-5088312f052d7be173f02945bcf83827aa702833.tar.gz hercules-5088312f052d7be173f02945bcf83827aa702833.tar.bz2 hercules-5088312f052d7be173f02945bcf83827aa702833.tar.xz hercules-5088312f052d7be173f02945bcf83827aa702833.zip | |
- Fixed wrong check of Deluge + Suiton which broke the water-requirement check for skills.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6103 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5105fc5ea..7dc1bea46 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/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.
diff --git a/src/map/skill.c b/src/map/skill.c index e7dd39134..71925a108 100644 --- a/src/map/skill.c +++ b/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);
|