diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
| commit | 1ba24673e7064e39406e6faf11d790c2dcc2ac00 (patch) | |
| tree | 7e2645f6fdec1dcc63ae56366371246f62865dcd /src/map/script-parse.cpp | |
| parent | c3e06ffe6437d27a2a7c6ddb2dc487ff2f007adf (diff) | |
| parent | c786a93e91adaf68780a5fd7585f51d0528f92ed (diff) | |
| download | tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.gz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.bz2 tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.xz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.zip | |
Merge self-fork from mekolat/magic-v3
Magic v3
Diffstat (limited to 'src/map/script-parse.cpp')
| -rw-r--r-- | src/map/script-parse.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/script-parse.cpp b/src/map/script-parse.cpp index a785748..f8d7b6b 100644 --- a/src/map/script-parse.cpp +++ b/src/map/script-parse.cpp @@ -283,6 +283,10 @@ ZString::iterator skip_word(ZString::iterator p) p++; // MAP鯖内共有変数用 if (*p == '@') p++; // 一時的変数用(like weiss) + if (*p == '.') + p++; // npc + if (*p == '@') + p++; // scope if (*p == '#') p++; // account変数用 if (*p == '#') @@ -613,6 +617,7 @@ ZString::iterator ScriptBuffer::parse_line(ZString::iterator p, bool *can_step) { // TODO should be LString, but no heterogenous lookup yet + // FIXME / TODO: allow destroy to both be a statement and a terminator static std::set<ZString> terminators = { @@ -623,6 +628,7 @@ ZString::iterator ScriptBuffer::parse_line(ZString::iterator p, bool *can_step) "end"_s, "mapexit"_s, "shop"_s, + "destroy"_s, }; *can_step = terminators.count(cmd->strs) == 0; } |