summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-01-25 15:06:30 +0100
committerTycho <work.tycho+git@gmail.com>2014-01-25 15:06:30 +0100
commit2806b48afa4e3d087c8a123d81f9eabe3ec797c5 (patch)
treef14d54b865d2b9ee06cfe295e2b4619486633c41
parentFixed spelling error (diff)
downloadcuberite-2806b48afa4e3d087c8a123d81f9eabe3ec797c5.tar
cuberite-2806b48afa4e3d087c8a123d81f9eabe3ec797c5.tar.gz
cuberite-2806b48afa4e3d087c8a123d81f9eabe3ec797c5.tar.bz2
cuberite-2806b48afa4e3d087c8a123d81f9eabe3ec797c5.tar.lz
cuberite-2806b48afa4e3d087c8a123d81f9eabe3ec797c5.tar.xz
cuberite-2806b48afa4e3d087c8a123d81f9eabe3ec797c5.tar.zst
cuberite-2806b48afa4e3d087c8a123d81f9eabe3ec797c5.zip
-rw-r--r--src/Bindings/AllToLua.pkg1
-rw-r--r--src/Bindings/ManualBindings.cpp2
-rw-r--r--src/WorldStorage/SchematicFileSerializer.h5
3 files changed, 1 insertions, 7 deletions
diff --git a/src/Bindings/AllToLua.pkg b/src/Bindings/AllToLua.pkg
index 8b2a78d05..f65aed9bb 100644
--- a/src/Bindings/AllToLua.pkg
+++ b/src/Bindings/AllToLua.pkg
@@ -70,7 +70,6 @@ $cfile "../Generating/ChunkDesc.h"
$cfile "../CraftingRecipes.h"
$cfile "../UI/Window.h"
$cfile "../Mobs/Monster.h"
-$cfile "../WorldStorage/SchematicFileSerializer.h"
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 299dfd9ee..4e92da5ae 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -2258,7 +2258,6 @@ static int tolua_cBlockArea_LoadFromSchematicFile(lua_State * tolua_S)
}
AString Filename = tolua_tostring(tolua_S, 2, 0);
- LOGWARNING("cBlockArea::LoadFromSchematic file is depreciated. Please use cSchematicFileSerilizer::LoadFromSchematicFile.");
bool res = cSchematicFileSerializer::LoadFromSchematicFile(*self,Filename);
tolua_pushboolean(tolua_S, res);
return 1;
@@ -2287,7 +2286,6 @@ static int tolua_cBlockArea_SaveToSchematicFile(lua_State * tolua_S)
return 0;
}
AString Filename = tolua_tostring(tolua_S, 2, 0);
- LOGWARNING("cBlockArea::SaveToSchematic file is depreciated. Please use cSchematicFileSerializer::SaveToSchematicFile.");
bool res = cSchematicFileSerializer::SaveToSchematicFile(*self,Filename);
tolua_pushboolean(tolua_S, res);
return 1;
diff --git a/src/WorldStorage/SchematicFileSerializer.h b/src/WorldStorage/SchematicFileSerializer.h
index 31b36695c..9be2e5b57 100644
--- a/src/WorldStorage/SchematicFileSerializer.h
+++ b/src/WorldStorage/SchematicFileSerializer.h
@@ -13,7 +13,6 @@ class cParsedNBT;
-// tolua_begin
class cSchematicFileSerializer
{
public:
@@ -24,9 +23,7 @@ public:
/// Saves the area into a .schematic file. Returns true if successful
static bool SaveToSchematicFile(cBlockArea & a_BlockArea, const AString & a_FileName);
- // tolua_end
-
private:
/// Loads the area from a schematic file uncompressed and parsed into a NBT tree. Returns true if successful.
static bool LoadFromSchematicNBT(cBlockArea & a_BlockArea, cParsedNBT & a_NBT);
-}; // tolua_export
+};