From 08809eeb1db043ac72ca8a64f74e9f5ed6a54631 Mon Sep 17 00:00:00 2001 From: mekolat Date: Fri, 22 May 2015 13:09:14 -0400 Subject: add map mask support --- src/map/npc-parse.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/map/npc-parse.cpp') 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()) -- cgit v1.2.3-70-g09d2