diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-15 19:34:59 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-16 18:58:48 -0700 |
| commit | c812c92d1a1835f0bda783e709481188c8d92225 (patch) | |
| tree | b401ede48a088ad1aaed88fe3b997cd26ff7ae08 /src/map/map.hpp | |
| parent | de9ee1b9754af9d954487121947352f32d7ebb7e (diff) | |
| download | tmwa-c812c92d1a1835f0bda783e709481188c8d92225.tar.gz tmwa-c812c92d1a1835f0bda783e709481188c8d92225.tar.bz2 tmwa-c812c92d1a1835f0bda783e709481188c8d92225.tar.xz tmwa-c812c92d1a1835f0bda783e709481188c8d92225.zip | |
Clean up header organization
Diffstat (limited to 'src/map/map.hpp')
| -rw-r--r-- | src/map/map.hpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp index 1964a3c..d476dbc 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -1,5 +1,5 @@ -#ifndef MAP_HPP -#define MAP_HPP +#ifndef TMWA_MAP_MAP_HPP +#define TMWA_MAP_MAP_HPP # include "map.t.hpp" @@ -13,12 +13,13 @@ # include "../strings/astring.hpp" # include "../strings/vstring.hpp" +# include "../generic/db.hpp" +# include "../generic/matrix.hpp" + # include "../io/cxxstdio.hpp" -# include "../common/db.hpp" -# include "../common/matrix.hpp" -# include "../common/socket.hpp" -# include "../common/timer.t.hpp" +# include "../mmo/socket.hpp" +# include "../mmo/timer.t.hpp" # include "battle.t.hpp" # include "magic-interpreter.t.hpp" @@ -714,4 +715,4 @@ inline dumb_ptr<npc_data_shop> npc_data::is_shop() { return npc_subtype == NpcSu inline dumb_ptr<npc_data_warp> npc_data::is_warp() { return npc_subtype == NpcSubtype::WARP ? as_warp() : nullptr ; } inline dumb_ptr<npc_data_message> npc_data::is_message() { return npc_subtype == NpcSubtype::MESSAGE ? as_message() : nullptr ; } -#endif // MAP_HPP +#endif // TMWA_MAP_MAP_HPP |