mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 00:26:50 +02:00
Move AreaStore to util
This commit is contained in:
parent
f021db7243
commit
0079887b64
@ -112,7 +112,6 @@ LOCAL_C_INCLUDES := \
|
||||
deps/sqlite/
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
jni/src/areastore.cpp \
|
||||
jni/src/ban.cpp \
|
||||
jni/src/camera.cpp \
|
||||
jni/src/cavegen.cpp \
|
||||
@ -221,6 +220,7 @@ LOCAL_SRC_FILES := \
|
||||
jni/src/version.cpp \
|
||||
jni/src/voxel.cpp \
|
||||
jni/src/voxelalgorithms.cpp \
|
||||
jni/src/util/areastore.cpp \
|
||||
jni/src/util/auth.cpp \
|
||||
jni/src/util/base64.cpp \
|
||||
jni/src/util/directiontables.cpp \
|
||||
|
@ -348,7 +348,6 @@ add_subdirectory(unittest)
|
||||
add_subdirectory(util)
|
||||
|
||||
set(common_SRCS
|
||||
areastore.cpp
|
||||
ban.cpp
|
||||
cavegen.cpp
|
||||
chat.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"
|
||||
|
@ -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_
|
||||
|
@ -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"
|
||||
|
@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
|
||||
#include "test.h"
|
||||
|
||||
#include "areastore.h"
|
||||
#include "util/areastore.h"
|
||||
|
||||
class TestAreaStore : public TestBase {
|
||||
public:
|
||||
|
@ -1,4 +1,5 @@
|
||||
set(UTIL_SRCS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/areastore.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
|
||||
|
@ -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.
|
||||
*/
|
||||
|
||||
#include "areastore.h"
|
||||
#include "util/areastore.h"
|
||||
#include "util/serialize.h"
|
||||
#include "util/container.h"
|
||||
|
@ -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.
|
||||
*/
|
||||
|
||||
#ifndef AREASTORE_H_
|
||||
#define AREASTORE_H_
|
||||
#ifndef AREA_STORE_H_
|
||||
#define AREA_STORE_H_
|
||||
|
||||
#include "irr_v3d.h"
|
||||
#include "noise.h" // for PcgRandom
|
||||
@ -174,4 +174,4 @@ private:
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* AREASTORE_H_ */
|
||||
#endif // AREA_STORE_H_
|
Loading…
Reference in New Issue
Block a user