summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-10-25 11:59:09 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-10-25 11:59:09 +0000
commit6f41f8b501ba5fcad54e08ed175b0ab61f4dbd54 (patch)
tree3e266dea3b4b50a82bde3a7ea4ab15c8d4955257 /src/map/script.c
parent8dc2ec08666cac608e391fa6c47b9248dd273f99 (diff)
downloadhercules-6f41f8b501ba5fcad54e08ed175b0ab61f4dbd54.tar.gz
hercules-6f41f8b501ba5fcad54e08ed175b0ab61f4dbd54.tar.bz2
hercules-6f41f8b501ba5fcad54e08ed175b0ab61f4dbd54.tar.xz
hercules-6f41f8b501ba5fcad54e08ed175b0ab61f4dbd54.zip
Hardcoded the even label config settings from r14097.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14099 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/map/script.c b/src/map/script.c
index e3f1dddc1..db8add252 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -217,8 +217,8 @@ struct Script_Config script_config = {
"OnPCLoadMapEvent", //loadmap_event_name
"OnPCBaseLvUpEvent", //baselvup_event_name
"OnPCJobLvUpEvent", //joblvup_event_name
- "OnTouch", //Official version of OnTouch
- "OnTouch2", //Official version of OnTouch2
+ "OnTouch_", //ontouch_name (runs on first visible char to enter area, picks another char if the first char leaves)
+ "OnTouch", //ontouch2_name (run whenever a char walks into the OnTouch area)
};
static jmp_buf error_jump;
@@ -3340,12 +3340,6 @@ int script_config_read(char *cfgName)
else if(strcmpi(w1,"input_max_value")==0) {
script_config.input_max_value = config_switch(w2);
}
- else if(strcmpi(w1, "OnTouch_Label") == 0) {
- safestrncpy(script_config.ontouch_name, w2, NAME_LENGTH);
- }
- else if(strcmpi(w1, "OnTouch2_Label") == 0) {
- safestrncpy(script_config.ontouch2_name, w2, NAME_LENGTH);
- }
else if(strcmpi(w1,"import")==0){
script_config_read(w2);
}