summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2015-05-20 13:22:05 -0400
committermekolat <mekolat@users.noreply.github.com>2015-05-20 13:22:05 -0400
commitab836451986e596d66df6aadd6af7a955ae8ff4e (patch)
tree7db3afc5f050564d9dcbdbac25d18563a879f666 /src
parentc0ada60ff51a7166f782a88e56e7a880e4e34650 (diff)
downloadtmwa-ab836451986e596d66df6aadd6af7a955ae8ff4e.tar.gz
tmwa-ab836451986e596d66df6aadd6af7a955ae8ff4e.tar.bz2
tmwa-ab836451986e596d66df6aadd6af7a955ae8ff4e.tar.xz
tmwa-ab836451986e596d66df6aadd6af7a955ae8ff4e.zip
use abort instead of runflag on errors
Diffstat (limited to 'src')
-rw-r--r--src/map/script-call.cpp13
-rw-r--r--src/map/script-fun.cpp8
2 files changed, 8 insertions, 13 deletions
diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp
index 1514ec2..83b6f24 100644
--- a/src/map/script-call.cpp
+++ b/src/map/script-call.cpp
@@ -586,8 +586,7 @@ void run_func(ScriptState *st)
if (battle_config.error_log)
PRINTF("function not found\n"_fmt);
st->state = ScriptEndState::END;
- runflag = 0;
- return;
+ abort();
}
}
// the func is before the arg
@@ -599,8 +598,7 @@ void run_func(ScriptState *st)
{
PRINTF("run_func: not function and command! \n"_fmt);
st->state = ScriptEndState::END;
- runflag = 0;
- return;
+ abort();
}
size_t func = st->stack->stack_datav[st->start].get_if<ScriptDataFuncRef>()->numi;
@@ -669,8 +667,7 @@ void run_func(ScriptState *st)
{
PRINTF("script:run_func (return) return without callfunc or callsub!\n"_fmt);
st->state = ScriptEndState::END;
- runflag = 0;
- return;
+ abort();
}
assert (olddefsp == st->defsp); // pretty sure it hasn't changed yet
st->scriptp.code = Some(conv_script(st, &st->stack->stack_datav[olddefsp - 1])); // スクリプトを復元
@@ -766,7 +763,7 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript)
{
PRINTF("run_script: infinity loop !\n"_fmt);
st->state = ScriptEndState::END;
- runflag = 0;
+ abort();
}
}
break;
@@ -828,7 +825,7 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript)
{
PRINTF("run_script: infinity loop !\n"_fmt);
st->state = ScriptEndState::END;
- runflag = 0;
+ abort();
}
}
switch (st->state)
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<ScriptDataPos>()->numi;
st->state = ScriptEndState::GOTO;