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 a9be52c41a.
This commit is contained in:
@@ -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 )
|
||||
|
||||
Reference in New Issue
Block a user