aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/FileInputStream.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/FileInputStream.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/FileInputStream.cpp')
-rw-r--r--Minecraft.World/FileInputStream.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.World/FileInputStream.cpp b/Minecraft.World/FileInputStream.cpp
index 7c34a22f..5e0f6ca5 100644
--- a/Minecraft.World/FileInputStream.cpp
+++ b/Minecraft.World/FileInputStream.cpp
@@ -24,20 +24,20 @@ FileInputStream::FileInputStream(const File &file)
file.getPath().c_str(), // file name
GENERIC_READ, // access mode
0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
- nullptr, // Unused
+ NULL, // Unused
OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
- nullptr // Unsupported
+ NULL // Unsupported
);
#else
m_fileHandle = CreateFile(
pchFilename, // file name
GENERIC_READ, // access mode
0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
- nullptr, // Unused
+ NULL, // Unused
OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
- nullptr // Unsupported
+ NULL // Unsupported
);
#endif
@@ -68,7 +68,7 @@ int FileInputStream::read()
&byteRead, // data buffer
1, // number of bytes to read
&numberOfBytesRead, // number of bytes read
- nullptr // overlapped buffer
+ NULL // overlapped buffer
);
if( bSuccess==FALSE )
@@ -100,7 +100,7 @@ int FileInputStream::read(byteArray b)
b.data, // data buffer
b.length, // number of bytes to read
&numberOfBytesRead, // number of bytes read
- nullptr // overlapped buffer
+ NULL // overlapped buffer
);
if( bSuccess==FALSE )
@@ -138,7 +138,7 @@ int FileInputStream::read(byteArray b, unsigned int offset, unsigned int length)
&b[offset], // data buffer
length, // number of bytes to read
&numberOfBytesRead, // number of bytes read
- nullptr // overlapped buffer
+ NULL // overlapped buffer
);
if( bSuccess==FALSE )