aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2015-10-29 23:26:03 -0400
committerShadowNinja <shadowninja@minetest.net>2016-03-07 16:33:20 -0500
commit0079887b645e0ee441bd2cfcd7874a1148fdd656 (patch)
tree2de01cef8f7ceb82f29cc38362dbdbb5eb391565 /src/script
parentf021db724301f082cbde719afb2405ec1d8cf82c (diff)
downloadminetest-0079887b645e0ee441bd2cfcd7874a1148fdd656.tar.gz
minetest-0079887b645e0ee441bd2cfcd7874a1148fdd656.tar.bz2
minetest-0079887b645e0ee441bd2cfcd7874a1148fdd656.zip
Move AreaStore to util
Diffstat (limited to 'src/script')
-rw-r--r--src/script/lua_api/l_areastore.cpp2
-rw-r--r--src/script/lua_api/l_areastore.h13
-rw-r--r--src/script/lua_api/l_util.cpp1
3 files changed, 7 insertions, 9 deletions
diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp
index ff6abbd9f..8b8b157d7 100644
--- a/src/script/lua_api/l_areastore.cpp
+++ b/src/script/lua_api/l_areastore.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_converter.h"
#include "cpp_api/s_security.h"
#include "irr_v3d.h"
-#include "areastore.h"
+#include "util/areastore.h"
#include "filesys.h"
#ifndef ANDROID
#include "cmake_config.h"
diff --git a/src/script/lua_api/l_areastore.h b/src/script/lua_api/l_areastore.h
index 543a2aa32..6321de6d1 100644
--- a/src/script/lua_api/l_areastore.h
+++ b/src/script/lua_api/l_areastore.h
@@ -17,15 +17,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef L_AREASTORE_H_
-#define L_AREASTORE_H_
+#ifndef L_AREA_STORE_H_
+#define L_AREA_STORE_H_
#include "lua_api/l_base.h"
-#include "areastore.h"
-/*
- AreaStore
- */
+
+class AreaStore;
+
class LuaAreaStore : public ModApiBase {
private:
@@ -66,4 +65,4 @@ public:
static void Register(lua_State *L);
};
-#endif /* L_AREASTORE_H_ */
+#endif // L_AREA_STORE_H_
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index 98f70d917..f990dacf9 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "serialization.h"
#include "json/json.h"
#include "cpp_api/s_security.h"
-#include "areastore.h"
#include "porting.h"
#include "debug.h"
#include "log.h"