diff options
| author | Wushin <pasekei@gmail.com> | 2015-02-28 19:12:15 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-02-28 19:12:15 -0600 |
| commit | 6bc82125235099bd21476fcc3056598f7ec028b8 (patch) | |
| tree | 3c053e8e7baa44465fbd90e5e02682e4fd500493 /src/map/script-call.cpp | |
| parent | 6ec97dc4556e36b7a3cdf17b8684fa074529ad8b (diff) | |
| parent | 697ab2d5ee8c840dba925425ddbf6eba9eb6ee44 (diff) | |
| download | tmwa-6bc82125235099bd21476fcc3056598f7ec028b8.tar.gz tmwa-6bc82125235099bd21476fcc3056598f7ec028b8.tar.bz2 tmwa-6bc82125235099bd21476fcc3056598f7ec028b8.tar.xz tmwa-6bc82125235099bd21476fcc3056598f7ec028b8.zip | |
Merge pull request #33 from mekolat/freeloop
add freeloop builtin
Diffstat (limited to 'src/map/script-call.cpp')
| -rw-r--r-- | src/map/script-call.cpp | 4 |
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; |