From 9d7fd8b37f97265f37cc12026e535e953942a1ab Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 23 Jul 2014 18:37:53 -0700 Subject: Move magic to its own namespace --- src/map/magic-expr-eval.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/map/magic-expr-eval.hpp') diff --git a/src/map/magic-expr-eval.hpp b/src/map/magic-expr-eval.hpp index a291fcd..3cbc8f5 100644 --- a/src/map/magic-expr-eval.hpp +++ b/src/map/magic-expr-eval.hpp @@ -28,7 +28,9 @@ namespace tmwa { -// TODO kill this like I killed VAR +namespace magic +{ +// TODO soon kill this unlike I killed VAR #define ARGINT(x) args[x].v.v_int #define ARGDIR(x) args[x].v.v_dir #define ARGSTR(x) ZString(args[x].v.v_string) @@ -55,4 +57,5 @@ namespace tmwa #define ARGMOB(x) (ARGENTITY(x)->is_mob()) #define ARG_MAY_BE_AREA(x) (ARG_TYPE(x) == TYPE::AREA || ARG_TYPE(x) == TYPE::LOCATION) +} // namespace magic } // namespace tmwa -- cgit v1.2.3-60-g2f50