From ab836451986e596d66df6aadd6af7a955ae8ff4e Mon Sep 17 00:00:00 2001 From: mekolat Date: Wed, 20 May 2015 13:22:05 -0400 Subject: use abort instead of runflag on errors --- src/map/script-fun.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/map/script-fun.cpp') diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 7617e0d..3949627 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -110,8 +110,7 @@ void builtin_goto(ScriptState *st) { PRINTF("fatal: script: goto: not label !\n"_fmt); st->state = ScriptEndState::END; - runflag = 0; - return; + abort(); } st->scriptp.pos = conv_num(st, &AARG(0)); @@ -152,7 +151,7 @@ void builtin_callfunc(ScriptState *st) { PRINTF("fatal: script: callfunc: function not found! [%s]\n"_fmt, str); st->state = ScriptEndState::END; - runflag = 0; + abort(); } } OMATCH_END (); @@ -296,8 +295,7 @@ void builtin_menu(ScriptState *st) { PRINTF("fatal: script:menu: not a label\n"_fmt); st->state = ScriptEndState::END; - runflag = 0; - return; + abort(); } st->scriptp.pos = AARG(arg_index).get_if()->numi; st->state = ScriptEndState::GOTO; -- cgit v1.2.3-70-g09d2