diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-07-23 18:37:53 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 15:59:36 -0700 |
| commit | 9d7fd8b37f97265f37cc12026e535e953942a1ab (patch) | |
| tree | 709218889e6977f9aeb1b47e9ce42d0e48b88007 /src/map/magic-interpreter.hpp | |
| parent | 44ba9a9eebec2ffe202fc5594f76864a56f3730a (diff) | |
| download | tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.gz tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.bz2 tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.xz tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.zip | |
Move magic to its own namespace
Diffstat (limited to 'src/map/magic-interpreter.hpp')
| -rw-r--r-- | src/map/magic-interpreter.hpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/map/magic-interpreter.hpp b/src/map/magic-interpreter.hpp index c9b6c97..62ab504 100644 --- a/src/map/magic-interpreter.hpp +++ b/src/map/magic-interpreter.hpp @@ -44,6 +44,8 @@ namespace tmwa { +namespace magic +{ struct location_t { map_local *m; @@ -403,11 +405,14 @@ struct invocation : block_list std::vector<status_change_ref_t> status_change_refv; }; +} // namespace magic // inlines for map.hpp -inline dumb_ptr<invocation> block_list::as_spell() { return dumb_ptr<invocation>(static_cast<invocation *>(this)); } -inline dumb_ptr<invocation> block_list::is_spell() { return bl_type == BL::SPELL ? as_spell() : nullptr; } +inline dumb_ptr<magic::invocation> block_list::as_spell() { return dumb_ptr<magic::invocation>(static_cast<magic::invocation *>(this)); } +inline dumb_ptr<magic::invocation> block_list::is_spell() { return bl_type == BL::SPELL ? as_spell() : nullptr; } +namespace magic +{ /* The following is used only by the parser: */ struct args_rec_t { @@ -426,4 +431,5 @@ struct proc_t , body() {} }; +} // namespace magic } // namespace tmwa |