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

Hardcoded the even label config settings from r14097.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14099 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-10-25 11:59:09 +00:00
parent da07c3b06e
commit a38fddad27
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
conf/script_athena.conf
View File

@ -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

10
src/map/script.c
View File

@ -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);
}

4
src/map/script.h
View File

@ -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 {