summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c10
-rw-r--r--src/map/script.h4
2 files changed, 4 insertions, 10 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);
}
diff --git a/src/map/script.h b/src/map/script.h
index fd329116e..84f2b34a1 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -26,8 +26,8 @@ extern struct Script_Config {
const char *baselvup_event_name;
const char *joblvup_event_name;
- char ontouch_name[NAME_LENGTH];
- char ontouch2_name[NAME_LENGTH];
+ const char* ontouch_name;
+ const char* ontouch2_name;
} script_config;
typedef enum c_op {