Ver Fonte

Replaced !sd->special_state.nocastcancel2 && something to (sd->special_state.nocastcancel2 || something).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5733 54d463be-8e91-2dee-dedb-b68131a5f0ec
blackhole89 há 19 anos atrás
pai
commit
5fe56e275c
2 ficheiros alterados com 4 adições e 2 exclusões
  1. 2 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/unit.c

+ 2 - 0
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]

+ 2 - 2
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;
 	}