From c8c061edf7c2441fce0dc0136cba293959ac1407 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 11 Oct 2020 16:14:43 +0000 Subject: [PATCH] Update comments and code for Load/SaveOneChunk so they match (#4992) Fixes #4991 --- src/WorldStorage/WorldStorage.cpp | 6 +++--- src/WorldStorage/WorldStorage.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp index c913eb15c..8f6259841 100644 --- a/src/WorldStorage/WorldStorage.cpp +++ b/src/WorldStorage/WorldStorage.cpp @@ -235,7 +235,9 @@ bool cWorldStorage::LoadOneChunk(void) } // Load the chunk: - return LoadChunk(ToLoad.m_ChunkX, ToLoad.m_ChunkZ); + LoadChunk(ToLoad.m_ChunkX, ToLoad.m_ChunkZ); + + return true; } @@ -253,14 +255,12 @@ bool cWorldStorage::SaveOneChunk(void) } // Save the chunk, if it's valid: - bool Status = false; if (m_World->IsChunkValid(ToSave.m_ChunkX, ToSave.m_ChunkZ)) { m_World->MarkChunkSaving(ToSave.m_ChunkX, ToSave.m_ChunkZ); if (m_SaveSchema->SaveChunk(cChunkCoords(ToSave.m_ChunkX, ToSave.m_ChunkZ))) { m_World->MarkChunkSaved(ToSave.m_ChunkX, ToSave.m_ChunkZ); - Status = true; } } diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h index fd6cd59e1..114abb651 100644 --- a/src/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -100,10 +100,10 @@ protected: virtual void Execute(void) override; - /** Loads one chunk from the queue (if any queued); returns true if there are more chunks in the load queue */ + /** Loads one chunk from the queue (if any queued); returns true if there was a chunk in the queue to load */ bool LoadOneChunk(void); - /** Saves one chunk from the queue (if any queued); returns true if there are more chunks in the save queue */ + /** Saves one chunk from the queue (if any queued); returns true if there was a chunk in the queue to save */ bool SaveOneChunk(void); } ;