summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-01-22 19:13:41 +0100
committerTycho <work.tycho+git@gmail.com>2014-01-22 19:13:41 +0100
commit1c320fa18c65ddb546ec5ff396f5554db306bd8b (patch)
treebfcf75a1bc5f7a294c8fe06a2255bae7dd75bd79
parentMerge branch 'master' into GeneratingBenchmark (diff)
downloadcuberite-1c320fa18c65ddb546ec5ff396f5554db306bd8b.tar
cuberite-1c320fa18c65ddb546ec5ff396f5554db306bd8b.tar.gz
cuberite-1c320fa18c65ddb546ec5ff396f5554db306bd8b.tar.bz2
cuberite-1c320fa18c65ddb546ec5ff396f5554db306bd8b.tar.lz
cuberite-1c320fa18c65ddb546ec5ff396f5554db306bd8b.tar.xz
cuberite-1c320fa18c65ddb546ec5ff396f5554db306bd8b.tar.zst
cuberite-1c320fa18c65ddb546ec5ff396f5554db306bd8b.zip
-rw-r--r--src/WorldStorage/SchematicFileSerilizer.cpp16
-rw-r--r--src/WorldStorage/SchematicFileSerilizer.h16
2 files changed, 26 insertions, 6 deletions
diff --git a/src/WorldStorage/SchematicFileSerilizer.cpp b/src/WorldStorage/SchematicFileSerilizer.cpp
index df68f3436..4e2ecb752 100644
--- a/src/WorldStorage/SchematicFileSerilizer.cpp
+++ b/src/WorldStorage/SchematicFileSerilizer.cpp
@@ -6,7 +6,7 @@
#include "SchematicFileSerilizer.h"
-bool cSchematicFileSerializer::LoadFromSchematicFile(cBlockArea& a_BlockArea, const AString & a_FileName)
+bool cSchematicFileSerializer::LoadFromSchematicFile(cBlockArea & a_BlockArea, const AString & a_FileName)
{
// Un-GZip the contents:
AString Contents;
@@ -35,7 +35,12 @@ bool cSchematicFileSerializer::LoadFromSchematicFile(cBlockArea& a_BlockArea, co
return LoadFromSchematicNBT(a_BlockArea, NBT);
}
-bool cSchematicFileSerializer::SaveToSchematicFile(cBlockArea& a_BlockArea, const AString & a_FileName)
+
+
+
+
+
+bool cSchematicFileSerializer::SaveToSchematicFile(cBlockArea & a_BlockArea, const AString & a_FileName)
{
cFastNBTWriter Writer("Schematic");
Writer.AddShort("Width", a_BlockArea.m_SizeX);
@@ -82,7 +87,12 @@ bool cSchematicFileSerializer::SaveToSchematicFile(cBlockArea& a_BlockArea, cons
return true;
}
-bool cSchematicFileSerializer::LoadFromSchematicNBT(cBlockArea& a_BlockArea, cParsedNBT & a_NBT)
+
+
+
+
+
+bool cSchematicFileSerializer::LoadFromSchematicNBT(cBlockArea & a_BlockArea, cParsedNBT & a_NBT)
{
int TMaterials = a_NBT.FindChildByName(a_NBT.GetRoot(), "Materials");
if ((TMaterials > 0) && (a_NBT.GetType(TMaterials) == TAG_String))
diff --git a/src/WorldStorage/SchematicFileSerilizer.h b/src/WorldStorage/SchematicFileSerilizer.h
index e4dcf3eb9..cb30e55d8 100644
--- a/src/WorldStorage/SchematicFileSerilizer.h
+++ b/src/WorldStorage/SchematicFileSerilizer.h
@@ -1,20 +1,30 @@
+#pragma once
+
#include "../BlockArea.h"
+
+
+
+
// fwd: FastNBT.h
class cParsedNBT;
+
+
+
+
class cSchematicFileSerializer
{
public:
/// Loads an area from a .schematic file. Returns true if successful
- static bool LoadFromSchematicFile(cBlockArea& a_BlockArea, const AString & a_FileName);
+ static bool LoadFromSchematicFile(cBlockArea & a_BlockArea, const AString & a_FileName);
/// Saves the area into a .schematic file. Returns true if successful
- static bool SaveToSchematicFile(cBlockArea& a_BlockArea, const AString & a_FileName);
+ static bool SaveToSchematicFile(cBlockArea & a_BlockArea, const AString & a_FileName);
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);
+ static bool LoadFromSchematicNBT(cBlockArea & a_BlockArea, cParsedNBT & a_NBT);
};