diff options
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; } |