diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-25 11:59:09 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-25 11:59:09 +0000 |
| commit | 6f41f8b501ba5fcad54e08ed175b0ab61f4dbd54 (patch) | |
| tree | 3e266dea3b4b50a82bde3a7ea4ab15c8d4955257 | |
| parent | 8dc2ec08666cac608e391fa6c47b9248dd273f99 (diff) | |
| download | hercules-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
| -rw-r--r-- | conf/script_athena.conf | 11 | ||||
| -rw-r--r-- | src/map/script.c | 10 | ||||
| -rw-r--r-- | src/map/script.h | 4 |
3 files changed, 4 insertions, 21 deletions
diff --git a/conf/script_athena.conf b/conf/script_athena.conf index 67521740a..f45af4bad 100644 --- a/conf/script_athena.conf +++ b/conf/script_athena.conf @@ -32,15 +32,4 @@ check_gotocount: 2048 //input_max_value: 2147483647 input_max_value: 10000000 -// Official Version of OnTouch -// Scripts run on the first visible character walks into the OnTouch area -// and before he walks out/hides, the scripts won't run ever again. -// This label takes the piority to OnTouch2_Label. -OnTouch_Label: OnTouch_ - -// Official Version of OnTouch2 -// Scripts run on every character walks into the OnTouch area -// This is the same as the "OnTouch" that eA has been using all along. -OnTouch2_Label: OnTouch - import: conf/import/script_conf.txt 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 { |