diff options
| author | meko <mekolat@users.noreply.github.com> | 2015-09-29 12:21:21 -0400 |
|---|---|---|
| committer | meko <mekolat@users.noreply.github.com> | 2015-09-29 12:21:21 -0400 |
| commit | 1deb35fc806cd4d9b7d3656448884491c5abb429 (patch) | |
| tree | ba5723306f5c9e7cb55f9b8ad0da36e0d9e1e717 /src/map/script-parse.cpp | |
| parent | 27a6ccd14809eb1c497adc398ecbecd0c0bd3c98 (diff) | |
| parent | 3d1770b8cc9e596ac33757ace64462ad3d90a15c (diff) | |
| download | tmwa-1deb35fc806cd4d9b7d3656448884491c5abb429.tar.gz tmwa-1deb35fc806cd4d9b7d3656448884491c5abb429.tar.bz2 tmwa-1deb35fc806cd4d9b7d3656448884491c5abb429.tar.xz tmwa-1deb35fc806cd4d9b7d3656448884491c5abb429.zip | |
Merge pull request #154 from mekolat/elif
some cherry-picked elements from magic-v3
Diffstat (limited to 'src/map/script-parse.cpp')
| -rw-r--r-- | src/map/script-parse.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/script-parse.cpp b/src/map/script-parse.cpp index 2c7305b..a785748 100644 --- a/src/map/script-parse.cpp +++ b/src/map/script-parse.cpp @@ -407,7 +407,8 @@ ZString::iterator ScriptBuffer::parse_simpleexpr(ZString::iterator p) parse_cmdp = Some(ld); // warn_*_mismatch_paramnumのために必要 // why not just check l->str == "if"_s or std::string(p, p2) == "if"_s? - if (Some(ld) == search_strp("if"_s)) // warn_cmd_no_commaのために必要 + if (Some(ld) == search_strp("if"_s) || Some(ld) == search_strp("elif"_s) + || Some(ld) == search_strp("else"_s)) // warn_cmd_no_commaのために必要 parse_cmd_if++; p = p2; |