Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14600 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2010-12-17 22:54:13 +00:00
parent ddbbf5e603
commit d59156d971
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -1,6 +1,7 @@
Date Added Date Added
2010/12/17 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] * 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] * Spellchecked script_commands.txt. [Ai4rei]
* Random script engine clean-ups that have accumulated over time. [Ai4rei] * Random script engine clean-ups that have accumulated over time. [Ai4rei]

4
src/map/script.c
View File

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