summaryrefslogtreecommitdiff
path: root/src/map/script-call.cpp
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2015-02-28 10:34:55 -0500
committermekolat <mekolat@gmail.com>2015-02-28 10:34:55 -0500
commit697ab2d5ee8c840dba925425ddbf6eba9eb6ee44 (patch)
tree3c053e8e7baa44465fbd90e5e02682e4fd500493 /src/map/script-call.cpp
parent6ec97dc4556e36b7a3cdf17b8684fa074529ad8b (diff)
downloadtmwa-697ab2d5ee8c840dba925425ddbf6eba9eb6ee44.tar.gz
tmwa-697ab2d5ee8c840dba925425ddbf6eba9eb6ee44.tar.bz2
tmwa-697ab2d5ee8c840dba925425ddbf6eba9eb6ee44.tar.xz
tmwa-697ab2d5ee8c840dba925425ddbf6eba9eb6ee44.zip
add freeloop builtin
Diffstat (limited to 'src/map/script-call.cpp')
-rw-r--r--src/map/script-call.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp
index b66af74..f412328 100644
--- a/src/map/script-call.cpp
+++ b/src/map/script-call.cpp
@@ -757,7 +757,7 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript)
{
rerun_pos = st->scriptp.pos;
st->state = ScriptEndState::ZERO;
- if (gotocount > 0 && (--gotocount) <= 0)
+ if (!st->freeloop && gotocount > 0 && (--gotocount) <= 0)
{
PRINTF("run_script: infinity loop !\n"_fmt);
st->state = ScriptEndState::END;
@@ -806,7 +806,7 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript)
st->state = ScriptEndState::END;
break;
}
- if (cmdcount > 0 && (--cmdcount) <= 0)
+ if (!st->freeloop && cmdcount > 0 && (--cmdcount) <= 0)
{
PRINTF("run_script: infinity loop !\n"_fmt);
st->state = ScriptEndState::END;