From 4a0355f065a3be357cfb0e650224903f53e70913 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Wed, 6 Sep 2017 18:40:04 +0100 Subject: cBlockArea: use unique_ptr --- src/WorldStorage/SchematicFileSerializer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/WorldStorage/SchematicFileSerializer.cpp') diff --git a/src/WorldStorage/SchematicFileSerializer.cpp b/src/WorldStorage/SchematicFileSerializer.cpp index d6bcf840f..e72f58fa3 100644 --- a/src/WorldStorage/SchematicFileSerializer.cpp +++ b/src/WorldStorage/SchematicFileSerializer.cpp @@ -210,7 +210,7 @@ bool cSchematicFileSerializer::LoadFromSchematicNBT(cBlockArea & a_BlockArea, cP ); NumTypeBytes = a_NBT.GetDataLength(TBlockTypes); } - memcpy(a_BlockArea.m_BlockTypes, a_NBT.GetData(TBlockTypes), NumTypeBytes); + memcpy(a_BlockArea.GetBlockTypes(), a_NBT.GetData(TBlockTypes), NumTypeBytes); if (AreMetasPresent) { @@ -222,7 +222,7 @@ bool cSchematicFileSerializer::LoadFromSchematicNBT(cBlockArea & a_BlockArea, cP ); NumMetaBytes = a_NBT.GetDataLength(TBlockMetas); } - memcpy(a_BlockArea.m_BlockMetas, a_NBT.GetData(TBlockMetas), NumMetaBytes); + memcpy(a_BlockArea.GetBlockMetas(), a_NBT.GetData(TBlockMetas), NumMetaBytes); } return true; @@ -241,7 +241,7 @@ AString cSchematicFileSerializer::SaveToSchematicNBT(const cBlockArea & a_BlockA Writer.AddString("Materials", "Alpha"); if (a_BlockArea.HasBlockTypes()) { - Writer.AddByteArray("Blocks", reinterpret_cast(a_BlockArea.m_BlockTypes), a_BlockArea.GetBlockCount()); + Writer.AddByteArray("Blocks", reinterpret_cast(a_BlockArea.GetBlockTypes()), a_BlockArea.GetBlockCount()); } else { @@ -250,7 +250,7 @@ AString cSchematicFileSerializer::SaveToSchematicNBT(const cBlockArea & a_BlockA } if (a_BlockArea.HasBlockMetas()) { - Writer.AddByteArray("Data", reinterpret_cast(a_BlockArea.m_BlockMetas), a_BlockArea.GetBlockCount()); + Writer.AddByteArray("Data", reinterpret_cast(a_BlockArea.GetBlockMetas()), a_BlockArea.GetBlockCount()); } else { -- cgit v1.2.3