From c812c92d1a1835f0bda783e709481188c8d92225 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 15 Mar 2014 19:34:59 -0700 Subject: Clean up header organization --- src/map/script.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/map/script.hpp') diff --git a/src/map/script.hpp b/src/map/script.hpp index 91ee6a5..6cf40b0 100644 --- a/src/map/script.hpp +++ b/src/map/script.hpp @@ -1,5 +1,5 @@ -#ifndef SCRIPT_HPP -#define SCRIPT_HPP +#ifndef TMWA_MAP_SCRIPT_HPP +#define TMWA_MAP_SCRIPT_HPP # include # include // for inlined get_str - TODO remove @@ -10,9 +10,10 @@ # include "../strings/astring.hpp" # include "../strings/zstring.hpp" -# include "../common/db.hpp" -# include "../common/dumb_ptr.hpp" -# include "../common/utils.hpp" +# include "../generic/db.hpp" + +# include "../mmo/dumb_ptr.hpp" +# include "../mmo/utils.hpp" # include "map.t.hpp" @@ -175,4 +176,4 @@ void set_script_var_s(dumb_ptr sd, VarName var, int e, XString int get_script_var_i(dumb_ptr sd, VarName var, int e); ZString get_script_var_s(dumb_ptr sd, VarName var, int e); -#endif // SCRIPT_HPP +#endif // TMWA_MAP_SCRIPT_HPP -- cgit v1.2.3-60-g2f50