Parcourir la source

* Fixed label definitions silently overwriting built-in script functions (bugreport:2806, follow up to r8027).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14600 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei il y a 14 ans
Parent
commit
d59156d971
2 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. 1 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/script.c

+ 1 - 0
Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 2010/12/17
+	* Fixed label definitions silently overwriting built-in script functions (bugreport:2806, follow up to r8027). [Ai4rei]
 	* Added temporary check to skill_delunitgroup to prevent crashes when 'group' is NULL and added some debug messages to track down the source of the crash (bugreport:3504). [Ai4rei]
 	* Spellchecked script_commands.txt. [Ai4rei]
 	* Random script engine clean-ups that have accumulated over time. [Ai4rei]

+ 2 - 2
src/map/script.c

@@ -739,8 +739,8 @@ void set_label(int l,int pos, const char* script_pos)
 {
 	int i,next;
 
-	if(str_data[l].type==C_INT || str_data[l].type==C_PARAM)
-	{	//Prevent overwriting constants values and parameters [Skotlex]
+	if(str_data[l].type==C_INT || str_data[l].type==C_PARAM || str_data[l].type==C_FUNC)
+	{	//Prevent overwriting constants values, parameters and built-in functions [Skotlex]
 		disp_error_message("set_label: invalid label name",script_pos);
 		return;
 	}