summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-17 22:54:13 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-17 22:54:13 +0000
commit934f4af797ab3f35c249cc70a1631696328f16d0 (patch)
tree684263ae5a4a72c5e5f4d6cad8efac6e48b73b36 /src
parent590cab6d67e00e0620cf31fc8fbe5ed5ec1b7abf (diff)
downloadhercules-934f4af797ab3f35c249cc70a1631696328f16d0.tar.gz
hercules-934f4af797ab3f35c249cc70a1631696328f16d0.tar.bz2
hercules-934f4af797ab3f35c249cc70a1631696328f16d0.tar.xz
hercules-934f4af797ab3f35c249cc70a1631696328f16d0.zip
* Fixed label definitions silently overwriting built-in script functions (bugreport:2806, follow up to r8027).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14600 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 19961c438..04cb0593b 100644
--- a/src/map/script.c
+++ b/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;
}