summaryrefslogtreecommitdiff
path: root/src/ast/npc.hpp
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2015-05-02 15:28:58 -0400
committermekolat <mekolat@users.noreply.github.com>2015-05-02 16:54:00 -0400
commit46e503a063783c8cd5a701615168e89a1992b5dc (patch)
tree80bf34e40b06c487c7db75a6ed64cb7a8ce9fa28 /src/ast/npc.hpp
parent477a8ce254ddd82bc2396f4abe341a2c66c85919 (diff)
downloadtmwa-46e503a063783c8cd5a701615168e89a1992b5dc.tar.gz
tmwa-46e503a063783c8cd5a701615168e89a1992b5dc.tar.bz2
tmwa-46e503a063783c8cd5a701615168e89a1992b5dc.tar.xz
tmwa-46e503a063783c8cd5a701615168e89a1992b5dc.zip
npc -1 => 32767
Diffstat (limited to 'src/ast/npc.hpp')
-rw-r--r--src/ast/npc.hpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/ast/npc.hpp b/src/ast/npc.hpp
index a51acd3..ca6479e 100644
--- a/src/ast/npc.hpp
+++ b/src/ast/npc.hpp
@@ -103,14 +103,6 @@ namespace npc
Spanned<NpcName> name;
io::LineSpan key4_span;
};
- struct ScriptMapNone
- {
- Spanned<MapName> m;
- Spanned<unsigned> x, y;
- Spanned<DIR> d;
- Spanned<NpcName> name;
- io::LineSpan key4_span;
- };
struct ScriptMap
{
Spanned<MapName> m;
@@ -120,13 +112,12 @@ namespace npc
Spanned<Species> npc_class;
Spanned<unsigned> xs, ys;
};
- using ScriptBase = Variant<ScriptFunction, ScriptNone, ScriptMapNone, ScriptMap>;
+ using ScriptBase = Variant<ScriptFunction, ScriptNone, ScriptMap>;
struct Script : ScriptBase
{
Script() = default;
Script(ScriptFunction s) : ScriptBase(std::move(s)) {}
Script(ScriptNone s) : ScriptBase(std::move(s)) {}
- Script(ScriptMapNone s) : ScriptBase(std::move(s)) {}
Script(ScriptMap s) : ScriptBase(std::move(s)) {}
io::LineSpan key_span;