diff options
| author | Wushin <pasekei@gmail.com> | 2015-06-20 17:51:22 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-06-20 17:51:22 -0500 |
| commit | c399d19bda962e5dc2bf79998629d3ec279a9cd1 (patch) | |
| tree | e428ef99dff34cfce275038af64eb367a489dbed /src/map/npc-parse.cpp | |
| parent | 4835eae62fe129ff6ee36d82b56e07913ca19f81 (diff) | |
| parent | 08809eeb1db043ac72ca8a64f74e9f5ed6a54631 (diff) | |
| download | tmwa-c399d19bda962e5dc2bf79998629d3ec279a9cd1.tar.gz tmwa-c399d19bda962e5dc2bf79998629d3ec279a9cd1.tar.bz2 tmwa-c399d19bda962e5dc2bf79998629d3ec279a9cd1.tar.xz tmwa-c399d19bda962e5dc2bf79998629d3ec279a9cd1.zip | |
Merge pull request #98 from mekolat/command
npc actions
Diffstat (limited to 'src/map/npc-parse.cpp')
| -rw-r--r-- | src/map/npc-parse.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp index 0a0d682..9ee84d2 100644 --- a/src/map/npc-parse.cpp +++ b/src/map/npc-parse.cpp @@ -354,7 +354,7 @@ bool npc_load_mapflag(ast::npc::MapFlag& mapflag) } MapName savemap; - int savex, savey; + int savex, savey, mask; if (mf == MapFlag::NOSAVE) { @@ -392,6 +392,19 @@ bool npc_load_mapflag(ast::npc::MapFlag& mapflag) return false; } } + else if (mf == MapFlag::MASK) + { + if (mapflag.vec_extra.data.size() == 1 + && extract(mapflag.vec_extra.data[0].data, &mask)) + { + m->mask = mask; + } + else + { + mapflag.vec_extra.span.error("Unable to extract map mask"_s); + return false; + } + } else { if (mapflag.vec_extra.data.size()) |