summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-10-16 12:09:45 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-10-16 12:09:45 -0700
commit989a1f7bcc2bb7c74cfed974972e3bd248b58f6a (patch)
treeaa1264d39e53bede2e44a766ca54b626c3ae8fcc
parent96de926c20acf3cb47b7f60ca769cfa7b78f11b7 (diff)
downloadtmwa-989a1f7bcc2bb7c74cfed974972e3bd248b58f6a.tar.gz
tmwa-989a1f7bcc2bb7c74cfed974972e3bd248b58f6a.tar.bz2
tmwa-989a1f7bcc2bb7c74cfed974972e3bd248b58f6a.tar.xz
tmwa-989a1f7bcc2bb7c74cfed974972e3bd248b58f6a.zip
Error instead of hang when parsing script with double semi
-rw-r--r--src/map/script-parse.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/script-parse.cpp b/src/map/script-parse.cpp
index 10d1582..e2cb4c6 100644
--- a/src/map/script-parse.cpp
+++ b/src/map/script-parse.cpp
@@ -592,7 +592,11 @@ ZString::iterator ScriptBuffer::parse_line(ZString::iterator p, bool *can_step)
p = skip_space(p);
if (*p == ';')
+ {
+ disp_error_message("Double semi-colon"_s, p);
+ ++p;
return p;
+ }
parse_cmd_if = 0; // warn_cmd_no_commaのために必要