From 278c2a8a88966a61a3c41a78c843cf9b6db4af2e Mon Sep 17 00:00:00 2001 From: mekolat Date: Tue, 5 May 2015 10:16:56 -0400 Subject: do not allow close/end in func or sub --- src/map/script-fun.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src') diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index fe46685..e619169 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -217,6 +217,14 @@ void builtin_next(ScriptState *st) static void builtin_close(ScriptState *st) { + if (st->stack->stack_datav[st->defsp - 1].is()) + { + dumb_ptr nd = map_id_is_npc(st->oid); + if(nd) + PRINTF("Deprecated: close in a callfunc or callsub! @ %s\n"_fmt, nd->name); + else + PRINTF("Deprecated: close in a callfunc or callsub! (no npc)\n"_fmt); + } st->state = ScriptEndState::END; clif_scriptclose(script_rid2sd(st), st->oid); } @@ -1258,6 +1266,14 @@ void builtin_getgmlevel(ScriptState *st) static void builtin_end(ScriptState *st) { + if (st->stack->stack_datav[st->defsp - 1].is()) + { + dumb_ptr nd = map_id_is_npc(st->oid); + if(nd) + PRINTF("Deprecated: close in a callfunc or callsub! @ %s\n"_fmt, nd->name); + else + PRINTF("Deprecated: close in a callfunc or callsub! (no npc)\n"_fmt); + } st->state = ScriptEndState::END; } -- cgit v1.2.3-60-g2f50