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

Reworked script_getfuncname - Fixes bugreport:7721

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17356 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
akinari1087 2013-06-11 17:26:00 +00:00
parent acb18492aa
commit 8d220fce91
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/map/script.c
View File

@ -111,6 +111,8 @@
#define script_getnum(st,val) conv_num(st, script_getdata(st,val)) #define script_getnum(st,val) conv_num(st, script_getdata(st,val))
#define script_getstr(st,val) conv_str(st, script_getdata(st,val)) #define script_getstr(st,val) conv_str(st, script_getdata(st,val))
#define script_getref(st,val) ( script_getdata(st,val)->ref ) #define script_getref(st,val) ( script_getdata(st,val)->ref )
// Returns name of currently running function
#define script_getfuncname(st) ( st->funcname )
// Note: "top" functions/defines use indexes relative to the top of the stack // Note: "top" functions/defines use indexes relative to the top of the stack
// -1 is the index of the data at the top // -1 is the index of the data at the top
@ -623,22 +625,6 @@ static void script_reportfunc(struct script_state* st)
} }
} }
// Returns name of currently running function
static char* script_getfuncname(struct script_state *st)
{
int i;
char* name = NULL;
for( i = 0; i < st->stack->sp; ++i ) {
struct script_data* data = &st->stack->stack_data[i];
if(data->type == C_NAME && str_data[data->u.num].type == C_FUNC) {
name = reference_getname(data);
if(strcmp(name,"jump_zero"))
break;
}
}
return name;
}
/*========================================== /*==========================================
* Output error message * Output error message
*------------------------------------------*/ *------------------------------------------*/
@ -3454,8 +3440,7 @@ int run_func(struct script_state *st)
for( i = end_sp-1; i > 0 ; --i ) for( i = end_sp-1; i > 0 ; --i )
if( st->stack->stack_data[i].type == C_ARG ) if( st->stack->stack_data[i].type == C_ARG )
break; break;
if( i == 0 ) if( i == 0 ) {
{
ShowError("script:run_func: C_ARG not found. please report this!!!\n"); ShowError("script:run_func: C_ARG not found. please report this!!!\n");
st->state = END; st->state = END;
script_reportsrc(st); script_reportsrc(st);
@ -3466,10 +3451,10 @@ int run_func(struct script_state *st)
st->end = end_sp; st->end = end_sp;
data = &st->stack->stack_data[st->start]; data = &st->stack->stack_data[st->start];
if( data->type == C_NAME && str_data[data->u.num].type == C_FUNC ) if( data->type == C_NAME && str_data[data->u.num].type == C_FUNC ) {
func = data->u.num; func = data->u.num;
else st->funcname = reference_getname(data);
{ } else {
ShowError("script:run_func: not a buildin command.\n"); ShowError("script:run_func: not a buildin command.\n");
script_reportdata(data); script_reportdata(data);
script_reportsrc(st); script_reportsrc(st);
@ -3477,12 +3462,11 @@ int run_func(struct script_state *st)
return 1; return 1;
} }
if( script_config.warn_func_mismatch_argtypes ) if( script_config.warn_func_mismatch_argtypes ) {
{
script_check_buildin_argtype(st, func); script_check_buildin_argtype(st, func);
} }
if(str_data[func].func){ if(str_data[func].func) {
if (str_data[func].func(st)) //Report error if (str_data[func].func(st)) //Report error
script_reportsrc(st); script_reportsrc(st);
} else { } else {
@ -3496,8 +3480,7 @@ int run_func(struct script_state *st)
return 0; return 0;
pop_stack(st, st->start, st->end); pop_stack(st, st->start, st->end);
if( st->state == RETFUNC ) if( st->state == RETFUNC ) {// return from a user-defined function
{// return from a user-defined function
struct script_retinfo* ri; struct script_retinfo* ri;
int olddefsp = st->stack->defsp; int olddefsp = st->stack->defsp;
int nargs; int nargs;

1
src/map/script.h
View File

@ -134,6 +134,7 @@ struct script_state {
unsigned op2ref : 1;// used by op_2 unsigned op2ref : 1;// used by op_2
unsigned npc_item_flag : 1; unsigned npc_item_flag : 1;
unsigned mes_active : 1; // Store if invoking character has a NPC dialog box open. unsigned mes_active : 1; // Store if invoking character has a NPC dialog box open.
unsigned char* funcname; // Stores the current running function name
}; };
struct script_reg { struct script_reg {