aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/ArchiveFile.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/ArchiveFile.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/ArchiveFile.cpp')
-rw-r--r--Minecraft.Client/ArchiveFile.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/Minecraft.Client/ArchiveFile.cpp b/Minecraft.Client/ArchiveFile.cpp
index 2e57a5bb..608428b6 100644
--- a/Minecraft.Client/ArchiveFile.cpp
+++ b/Minecraft.Client/ArchiveFile.cpp
@@ -30,7 +30,7 @@ void ArchiveFile::_readHeader(DataInputStream *dis)
ArchiveFile::ArchiveFile(File file)
{
- m_cachedData = NULL;
+ m_cachedData = nullptr;
m_sourcefile = file;
app.DebugPrintf("Loading archive file...\n");
#ifndef _CONTENT_PACKAGE
@@ -48,7 +48,7 @@ ArchiveFile::ArchiveFile(File file)
FileInputStream fis(file);
#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
- byteArray readArray(file.length());
+ byteArray readArray(static_cast<unsigned int>(file.length()));
fis.read(readArray,0,file.length());
ByteArrayInputStream bais(readArray);
@@ -122,20 +122,20 @@ byteArray ArchiveFile::getFile(const wstring &filename)
HANDLE hfile = CreateFile( m_sourcefile.getPath().c_str(),
GENERIC_READ,
0,
- NULL,
+ nullptr,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,
- NULL
+ nullptr
);
#else
app.DebugPrintf("Createfile archive\n");
HANDLE hfile = CreateFile( wstringtofilename(m_sourcefile.getPath()),
GENERIC_READ,
0,
- NULL,
+ nullptr,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,
- NULL
+ nullptr
);
#endif
@@ -144,7 +144,7 @@ byteArray ArchiveFile::getFile(const wstring &filename)
app.DebugPrintf("hfile ok\n");
DWORD ok = SetFilePointer( hfile,
data->ptr,
- NULL,
+ nullptr,
FILE_BEGIN
);
@@ -157,7 +157,7 @@ byteArray ArchiveFile::getFile(const wstring &filename)
(LPVOID) pbData,
data->filesize,
&bytesRead,
- NULL
+ nullptr
);
if(bSuccess==FALSE)
@@ -182,7 +182,7 @@ byteArray ArchiveFile::getFile(const wstring &filename)
#endif
// Compressed filenames are preceeded with an asterisk.
- if ( data->isCompressed && out.data != NULL )
+ if ( data->isCompressed && out.data != nullptr )
{
/* 4J-JEV:
* If a compressed file is accessed before compression object is
@@ -204,7 +204,7 @@ byteArray ArchiveFile::getFile(const wstring &filename)
out.length = decompressedSize;
}
- assert(out.data != NULL); // THERE IS NO FILE WITH THIS NAME!
+ assert(out.data != nullptr); // THERE IS NO FILE WITH THIS NAME!
}