diff options
| author | Samuel Barney <samjbarney@gmail.com> | 2015-07-29 17:04:03 +0200 |
|---|---|---|
| committer | Samuel Barney <samjbarney@gmail.com> | 2015-07-29 17:49:30 +0200 |
| commit | 804805d35a87c2acc9425d1762ad26b1ba2ec9ac (patch) | |
| tree | 13b603c8bbf8177da92ce87f5413fb646d204f3f /src/WorldStorage/SchematicFileSerializer.cpp | |
| parent | Merge pull request #2376 from mjhanninen/fix-freebsd-build (diff) | |
| download | cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.gz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.bz2 cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.lz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.xz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.zst cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/WorldStorage/SchematicFileSerializer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WorldStorage/SchematicFileSerializer.cpp b/src/WorldStorage/SchematicFileSerializer.cpp index 3e9ed5bef..6267668c5 100644 --- a/src/WorldStorage/SchematicFileSerializer.cpp +++ b/src/WorldStorage/SchematicFileSerializer.cpp @@ -271,13 +271,13 @@ bool cSchematicFileSerializer::LoadFromSchematicNBT(cBlockArea & a_BlockArea, cP AString cSchematicFileSerializer::SaveToSchematicNBT(const cBlockArea & a_BlockArea) { cFastNBTWriter Writer("Schematic"); - Writer.AddShort("Width", a_BlockArea.m_Size.x); - Writer.AddShort("Height", a_BlockArea.m_Size.y); - Writer.AddShort("Length", a_BlockArea.m_Size.z); + Writer.AddShort("Width", static_cast<Int16>(a_BlockArea.m_Size.x)); + Writer.AddShort("Height", static_cast<Int16>(a_BlockArea.m_Size.y)); + Writer.AddShort("Length", static_cast<Int16>(a_BlockArea.m_Size.z)); Writer.AddString("Materials", "Alpha"); if (a_BlockArea.HasBlockTypes()) { - Writer.AddByteArray("Blocks", (const char *)a_BlockArea.m_BlockTypes, a_BlockArea.GetBlockCount()); + Writer.AddByteArray("Blocks", reinterpret_cast<const char *>(a_BlockArea.m_BlockTypes), a_BlockArea.GetBlockCount()); } else { @@ -286,7 +286,7 @@ AString cSchematicFileSerializer::SaveToSchematicNBT(const cBlockArea & a_BlockA } if (a_BlockArea.HasBlockMetas()) { - Writer.AddByteArray("Data", (const char *)a_BlockArea.m_BlockMetas, a_BlockArea.GetBlockCount()); + Writer.AddByteArray("Data", reinterpret_cast<const char *>(a_BlockArea.m_BlockMetas), a_BlockArea.GetBlockCount()); } else { |