Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Minecraft.World/FileHeader.cpp
View File

@@ -5,7 +5,7 @@
FileHeader::FileHeader()
{
lastFile = nullptr;
lastFile = NULL;
m_saveVersion = 0;
// New saves should have an original version set to the latest version. This will be overridden when we load a save
@@ -49,7 +49,7 @@ FileEntry *FileHeader::AddFile( const wstring &name, unsigned int length /* = 0
void FileHeader::RemoveFile( FileEntry *file )
{
if( file == nullptr ) return;
if( file == NULL ) return;
AdjustStartOffsets(file, file->getFileSize(), true);
@@ -72,13 +72,13 @@ void FileHeader::WriteHeader( LPVOID saveMem )
unsigned int headerOffset = GetStartOfNextData();
// 4J Changed for save version 2 to be the number of files rather than the size in bytes
unsigned int headerSize = static_cast<int>(fileTable.size());
unsigned int headerSize = (int)(fileTable.size());
//DWORD numberOfBytesWritten = 0;
// Write the offset of the header
//assert(numberOfBytesWritten == 4);
int *begin = static_cast<int *>(saveMem);
int *begin = (int *)saveMem;
#ifdef __PSVITA__
VirtualCopyTo(begin, &headerOffset, sizeof(headerOffset));
#else
@@ -115,7 +115,7 @@ void FileHeader::WriteHeader( LPVOID saveMem )
app.DebugPrintf("Write save file with original version: %d, and current version %d\n", m_originalSaveVersion, versionNumber);
#endif
char *headerPosition = static_cast<char *>(saveMem) + headerOffset;
char *headerPosition = (char *)saveMem + headerOffset;
#ifdef _DEBUG_FILE_HEADER
app.DebugPrintf("\n\nWrite file Header: Offset = %d, Size = %d\n", headerOffset, headerSize);
@@ -164,7 +164,7 @@ void FileHeader::ReadHeader( LPVOID saveMem, ESavePlatform plat /*= SAVE_FILE_PL
// Read the offset of the header
//assert(numberOfBytesRead == 4);
int *begin = static_cast<int *>(saveMem);
int *begin = (int *)saveMem;
#ifdef __PSVITA__
VirtualCopyFrom(&headerOffset, begin, sizeof(headerOffset));
#else
@@ -205,7 +205,7 @@ void FileHeader::ReadHeader( LPVOID saveMem, ESavePlatform plat /*= SAVE_FILE_PL
app.DebugPrintf("\n\nRead file Header: Offset = %d, Size = %d\n", headerOffset, headerSize);
#endif
char *headerPosition = static_cast<char *>(saveMem) + headerOffset;
char *headerPosition = (char *)saveMem + headerOffset;
switch( m_saveVersion )
{
@@ -321,7 +321,7 @@ unsigned int FileHeader::GetStartOfNextData()
unsigned int FileHeader::GetFileSize()
{
return GetStartOfNextData() + ( sizeof(FileEntrySaveData) * static_cast<unsigned int>(fileTable.size()) );
return GetStartOfNextData() + ( sizeof(FileEntrySaveData) * (unsigned int)fileTable.size() );
}
void FileHeader::AdjustStartOffsets(FileEntry *file, DWORD nNumberOfBytesToWrite, bool subtract /*= false*/)
@@ -364,13 +364,13 @@ bool FileHeader::fileExists( const wstring &name )
vector<FileEntry *> *FileHeader::getFilesWithPrefix(const wstring &prefix)
{
vector<FileEntry *> *files = nullptr;
vector<FileEntry *> *files = NULL;
for( unsigned int i = 0; i < fileTable.size(); ++i )
{
if( wcsncmp( fileTable[i]->data.filename, prefix.c_str(), prefix.size() ) == 0 )
{
if( files == nullptr )
if( files == NULL )
{
files = new vector<FileEntry *>();
}
@@ -479,7 +479,7 @@ wstring FileHeader::getPlayerDataFilenameForSave(const PlayerUID& pUID)
vector<FileEntry *> *FileHeader::getValidPlayerDatFiles()
{
vector<FileEntry *> *files = nullptr;
vector<FileEntry *> *files = NULL;
// find filenames that match this pattern
// P_5e7ff8372ea9_00000004_Mark_4J
@@ -509,7 +509,7 @@ vector<FileEntry *> *FileHeader::getValidPlayerDatFiles()
continue;
// if we get here, it must be a valid filename
if( files == nullptr )
if( files == NULL )
{
files = new vector<FileEntry *>();
}
@@ -524,21 +524,21 @@ vector<FileEntry *> *FileHeader::getValidPlayerDatFiles()
vector<FileEntry *> *FileHeader::getDatFilesWithOnlineID(const PlayerUID& pUID)
{
if(pUID.isSignedIntoPSN() == false)
return nullptr;
return NULL;
vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
if(datFiles == nullptr)
return nullptr;
if(datFiles == NULL)
return NULL;
// we're looking for the online name from the pUID in these types of filenames -
// P_5e7ff8372ea9_00000004_Mark_4J
wchar_t onlineIDW[64];
mbstowcs(onlineIDW, pUID.getOnlineID(), 64);
vector<FileEntry *> *files = nullptr;
vector<FileEntry *> *files = NULL;
int onlineIDSize = wcslen(onlineIDW);
if(onlineIDSize == 0)
return nullptr;
return NULL;
wcscat(onlineIDW, L".dat");
@@ -564,7 +564,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithOnlineID(const PlayerUID& pUID)
{
if(wcsncmp(&filenameOnly[onlineIDStart], onlineIDW, onlineIDSize) == 0)
{
if( files == nullptr )
if( files == NULL )
{
files = new vector<FileEntry *>();
}
@@ -582,8 +582,8 @@ vector<FileEntry *> *FileHeader::getDatFilesWithMacAndUserID(const PlayerUID& pU
{
vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
if(datFiles == nullptr)
return nullptr;
if(datFiles == NULL)
return NULL;
// we're looking for the mac address and userIDfrom the pUID in these types of filenames -
// P_5e7ff8372ea9_00000004_Mark_4J
@@ -592,7 +592,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithMacAndUserID(const PlayerUID& pU
const wchar_t* pMacStr = macStr.c_str();
const wchar_t* pUserStr = userStr.c_str();
vector<FileEntry *> *files = nullptr;
vector<FileEntry *> *files = NULL;
static const int macAddrStart = 2; // 2 characters into the filename
static const int userIDStart = 15; // 15 characters into the filename
@@ -609,7 +609,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithMacAndUserID(const PlayerUID& pU
// check the userID matches
if(wcsncmp(&filenameOnly[userIDStart], pUserStr, userStr.size()) == 0)
{
if( files == nullptr )
if( files == NULL )
{
files = new vector<FileEntry *>();
}
@@ -627,12 +627,12 @@ vector<FileEntry *> *FileHeader::getDatFilesWithPrimaryUser()
{
vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
if(datFiles == nullptr)
return nullptr;
if(datFiles == NULL)
return NULL;
// we're just looking for filenames starting with "P_" in these types of filenames -
// P_5e7ff8372ea9_00000004_Mark_4J
vector<FileEntry *> *files = nullptr;
vector<FileEntry *> *files = NULL;
char tempStr[128];
for( unsigned int i = 0; i < datFiles->size(); ++i )
@@ -644,7 +644,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithPrimaryUser()
// check for "P_" prefix
if(wcsncmp(&filenameOnly[0], L"P_", 2) == 0)
{
if( files == nullptr )
if( files == NULL )
{
files = new vector<FileEntry *>();
}