Move AreaStore to util

master
ShadowNinja 2015-10-29 23:26:03 -04:00
parent f021db7243
commit 0079887b64
9 changed files with 14 additions and 16 deletions

View File

@ -112,7 +112,6 @@ LOCAL_C_INCLUDES := \
deps/sqlite/ deps/sqlite/
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
jni/src/areastore.cpp \
jni/src/ban.cpp \ jni/src/ban.cpp \
jni/src/camera.cpp \ jni/src/camera.cpp \
jni/src/cavegen.cpp \ jni/src/cavegen.cpp \
@ -221,6 +220,7 @@ LOCAL_SRC_FILES := \
jni/src/version.cpp \ jni/src/version.cpp \
jni/src/voxel.cpp \ jni/src/voxel.cpp \
jni/src/voxelalgorithms.cpp \ jni/src/voxelalgorithms.cpp \
jni/src/util/areastore.cpp \
jni/src/util/auth.cpp \ jni/src/util/auth.cpp \
jni/src/util/base64.cpp \ jni/src/util/base64.cpp \
jni/src/util/directiontables.cpp \ jni/src/util/directiontables.cpp \

View File

@ -348,7 +348,6 @@ add_subdirectory(unittest)
add_subdirectory(util) add_subdirectory(util)
set(common_SRCS set(common_SRCS
areastore.cpp
ban.cpp ban.cpp
cavegen.cpp cavegen.cpp
chat.cpp chat.cpp

View File

@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_converter.h" #include "common/c_converter.h"
#include "cpp_api/s_security.h" #include "cpp_api/s_security.h"
#include "irr_v3d.h" #include "irr_v3d.h"
#include "areastore.h" #include "util/areastore.h"
#include "filesys.h" #include "filesys.h"
#ifndef ANDROID #ifndef ANDROID
#include "cmake_config.h" #include "cmake_config.h"

View File

@ -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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef L_AREASTORE_H_ #ifndef L_AREA_STORE_H_
#define L_AREASTORE_H_ #define L_AREA_STORE_H_
#include "lua_api/l_base.h" #include "lua_api/l_base.h"
#include "areastore.h"
/*
AreaStore class AreaStore;
*/
class LuaAreaStore : public ModApiBase { class LuaAreaStore : public ModApiBase {
private: private:
@ -66,4 +65,4 @@ public:
static void Register(lua_State *L); static void Register(lua_State *L);
}; };
#endif /* L_AREASTORE_H_ */ #endif // L_AREA_STORE_H_

View File

@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "serialization.h" #include "serialization.h"
#include "json/json.h" #include "json/json.h"
#include "cpp_api/s_security.h" #include "cpp_api/s_security.h"
#include "areastore.h"
#include "porting.h" #include "porting.h"
#include "debug.h" #include "debug.h"
#include "log.h" #include "log.h"

View File

@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "test.h" #include "test.h"
#include "areastore.h" #include "util/areastore.h"
class TestAreaStore : public TestBase { class TestAreaStore : public TestBase {
public: public:

View File

@ -1,4 +1,5 @@
set(UTIL_SRCS set(UTIL_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/areastore.cpp
${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp ${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp
${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp ${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp ${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp

View File

@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "areastore.h" #include "util/areastore.h"
#include "util/serialize.h" #include "util/serialize.h"
#include "util/container.h" #include "util/container.h"

View File

@ -17,8 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef AREASTORE_H_ #ifndef AREA_STORE_H_
#define AREASTORE_H_ #define AREA_STORE_H_
#include "irr_v3d.h" #include "irr_v3d.h"
#include "noise.h" // for PcgRandom #include "noise.h" // for PcgRandom
@ -174,4 +174,4 @@ private:
#endif #endif
#endif /* AREASTORE_H_ */ #endif // AREA_STORE_H_