diff options
Diffstat (limited to 'src/map/npc-parse.cpp')
-rw-r--r-- | src/map/npc-parse.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp index 3df54c7..bdb212c 100644 --- a/src/map/npc-parse.cpp +++ b/src/map/npc-parse.cpp @@ -41,7 +41,9 @@ #include "../ast/npc.hpp" #include "battle.hpp" +#include "battle_conf.hpp" #include "clif.hpp" +#include "globals.hpp" #include "itemdb.hpp" #include "map.hpp" #include "mob.hpp" @@ -53,12 +55,8 @@ namespace tmwa { -static -std::list<AString> npc_srcs; - -static -int npc_warp, npc_shop, npc_script, npc_mob; - +namespace map +{ static void npc_clearsrcfile(void) { @@ -928,4 +926,5 @@ bool do_init_npc(void) } return rv; } +} // namespace map } // namespace tmwa |