From 950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Thu, 26 Jul 2018 22:24:36 +0100 Subject: CheckBasicStyle: Check number of empty lines between functions (#4267) Add check for number of empty lines between functions and fix the corresponding failures --- src/WorldStorage/NBTChunkSerializer.cpp | 7 +++++++ src/WorldStorage/SchematicFileSerializer.cpp | 2 -- src/WorldStorage/WSSAnvil.cpp | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/WorldStorage') diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index eb04e54e2..f53dba68b 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -883,6 +883,10 @@ void cNBTChunkSerializer::AddItemFrameEntity(cItemFrame * a_ItemFrame) m_Writer.EndCompound(); } + + + + void cNBTChunkSerializer::AddLeashKnotEntity(cLeashKnot * a_LeashKnot) { m_Writer.BeginCompound(""); @@ -892,6 +896,9 @@ void cNBTChunkSerializer::AddLeashKnotEntity(cLeashKnot * a_LeashKnot) } + + + void cNBTChunkSerializer::AddPaintingEntity(cPainting * a_Painting) { m_Writer.BeginCompound(""); diff --git a/src/WorldStorage/SchematicFileSerializer.cpp b/src/WorldStorage/SchematicFileSerializer.cpp index e72f58fa3..37d5a0c77 100644 --- a/src/WorldStorage/SchematicFileSerializer.cpp +++ b/src/WorldStorage/SchematicFileSerializer.cpp @@ -50,7 +50,6 @@ bool cSchematicFileSerializer::LoadFromSchematicFile(cBlockArea & a_BlockArea, c - bool cSchematicFileSerializer::LoadFromSchematicString(cBlockArea & a_BlockArea, const AString & a_SchematicData) { // Uncompress the data: @@ -105,7 +104,6 @@ bool cSchematicFileSerializer::SaveToSchematicFile(const cBlockArea & a_BlockAre - bool cSchematicFileSerializer::SaveToSchematicString(const cBlockArea & a_BlockArea, AString & a_Out) { // Serialize into NBT data: diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index 048220a31..30e90f536 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -75,7 +75,6 @@ Since only the header is actually in the memory, this number can be high, but st - //////////////////////////////////////////////////////////////////////////////// // cWSSAnvil: @@ -476,6 +475,7 @@ bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, const cParsedNBT + void cWSSAnvil::CopyNBTData(const cParsedNBT & a_NBT, int a_Tag, const AString & a_ChildName, char * a_Destination, size_t a_Length) { int Child = a_NBT.FindChildByName(a_Tag, a_ChildName); @@ -2081,6 +2081,7 @@ void cWSSAnvil::LoadArrowFromNBT(cEntityList & a_Entities, const cParsedNBT & a_ + void cWSSAnvil::LoadSplashPotionFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx) { std::unique_ptr SplashPotion = cpp14::make_unique(nullptr, 0, 0, 0, Vector3d(0, 0, 0), cItem()); -- cgit v1.2.3