From ed8f721679a82f81af62ece387d8cef66b3eec89 Mon Sep 17 00:00:00 2001 From: blackhole89 Date: Fri, 24 Mar 2006 18:35:14 +0000 Subject: Replaced !sd->special_state.nocastcancel2 && something to (sd->special_state.nocastcancel2 || something). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5733 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/unit.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7ec67d53f..6b12523b7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/03/24 + * Fixed unit_skillcastcancel reading the nocastcancel flags the exact + wrong way around [blackhole89] * Added function map_search_freecell to locate an available cell around an area (for recall/warping skills). UNTESTED. [Skotlex] * Added unit.c to the VC8 project files. Thanks to Joshuaali [Skotlex] diff --git a/src/map/unit.c b/src/map/unit.c index 1e2e2268b..ad76f5145 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1250,8 +1250,8 @@ int unit_skillcastcancel(struct block_list *bl,int type) if (!ud->state.skillcastcancel) return 0; - if (sd && !sd->special_state.no_castcancel2 && - !(sd->special_state.no_castcancel && !map_flag_gvg(bl->m))) + if (sd && (sd->special_state.no_castcancel2 || + (sd->special_state.no_castcancel && !map_flag_gvg(bl->m)))) //fixed flags being read the wrong way around [blackhole89] return 0; } -- cgit v1.2.3-60-g2f50