From 2b3c688b44712a5f693c44d8d46729aa69f25b45 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Tue, 10 Mar 2026 09:59:50 +1100
Subject: [PATCH] Use bool for save file close handles

---
 Minecraft.World/IO/Files/ConsoleSaveFile.h               | 2 +-
 Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp  | 2 +-
 Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp     | 4 ++--
 Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h       | 2 +-
 Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp | 2 +-
 Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp        | 4 ++--
 Minecraft.World/IO/Files/ConsoleSaveFileSplit.h          | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Minecraft.World/IO/Files/ConsoleSaveFile.h b/Minecraft.World/IO/Files/ConsoleSaveFile.h
index 818964175..28a1a73f3 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFile.h
+++ b/Minecraft.World/IO/Files/ConsoleSaveFile.h
@@ -14,7 +14,7 @@ public:
 	virtual BOOL writeFile(	FileEntry *file, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten) = 0;
 	virtual BOOL zeroFile(FileEntry *file, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten) = 0;
 	virtual BOOL readFile( FileEntry *file, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead ) = 0;
-	virtual BOOL closeHandle( FileEntry *file ) = 0;
+	virtual bool closeHandle( FileEntry *file ) = 0;
 	virtual void finalizeWrite() = 0;
 	virtual void tick() {};
 
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp
index 35cd702c7..658d498e7 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp
@@ -121,7 +121,7 @@ void ConsoleSaveFileInputStream::close()
 {
 	if( m_saveFile != NULL )
 	{
-		BOOL result = m_saveFile->closeHandle( m_file );
+		bool result = m_saveFile->closeHandle( m_file );
 
 		if( result == 0 )
 		{
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
index c0ea9c2df..3f58d6a33 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
@@ -451,13 +451,13 @@ BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, LPVOID lpBuffer, DWORD
 	return 1;
 }
 
-BOOL ConsoleSaveFileOriginal::closeHandle( FileEntry *file )
+bool ConsoleSaveFileOriginal::closeHandle( FileEntry *file )
 {
 	LockSaveAccess();
 	finalizeWrite();
 	ReleaseSaveAccess();
 
-	return TRUE;
+	return true;
 }
 
 void ConsoleSaveFileOriginal::finalizeWrite()
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h
index 5f6076633..8c7c5930f 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h
@@ -47,7 +47,7 @@ public:
 	virtual BOOL writeFile(	FileEntry *file, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten );
 	virtual BOOL zeroFile(FileEntry *file, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten);
 	virtual BOOL readFile( FileEntry *file, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead );
-	virtual BOOL closeHandle( FileEntry *file );
+	virtual bool closeHandle( FileEntry *file );
 
 	virtual void finalizeWrite();
 
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp
index 2193991e8..3972c79b8 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp
@@ -117,7 +117,7 @@ void ConsoleSaveFileOutputStream::close()
 {
 	if( m_saveFile != NULL )
 	{
-		BOOL result = m_saveFile->closeHandle( m_file );
+		bool result = m_saveFile->closeHandle( m_file );
 
 		if( result == 0 )
 		{
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
index bd5a999c6..a08c1d36c 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
@@ -892,13 +892,13 @@ BOOL ConsoleSaveFileSplit::readFile( FileEntry *file, LPVOID lpBuffer, DWORD nNu
 	return 1;
 }
 
-BOOL ConsoleSaveFileSplit::closeHandle( FileEntry *file )
+bool ConsoleSaveFileSplit::closeHandle( FileEntry *file )
 {
 	LockSaveAccess();
 	finalizeWrite();
 	ReleaseSaveAccess();
 
-	return TRUE;
+	return true;
 }
 
 // In this method, attempt to write any dirty region files, subject to maintaining a maximum write output rate. Writing is prioritised by time since the region was last written.
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h
index 38697c177..f9778fbe0 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h
@@ -99,7 +99,7 @@ public:
 	virtual BOOL writeFile(	FileEntry *file, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten );
 	virtual BOOL zeroFile(FileEntry *file, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten);
 	virtual BOOL readFile( FileEntry *file, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead );
-	virtual BOOL closeHandle( FileEntry *file );
+	virtual bool closeHandle( FileEntry *file );
 
 	virtual void finalizeWrite();
 	virtual void tick();