LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-08-02 14:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin unglobbing std::vector

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:58:11 -06:00
committed by JuiceyDev
parent d2e8a0f9f5
commit 5fad08b9fd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Minecraft.World/IO/Files/FileHeader.cpp
View File

@@ -363,9 +363,9 @@ bool FileHeader::fileExists( const std::wstring &name )
return false;
}
vector<FileEntry *> *FileHeader::getFilesWithPrefix(const std::wstring &prefix)
std::vector<FileEntry *> *FileHeader::getFilesWithPrefix(const std::wstring &prefix)
{
vector<FileEntry *> *files = NULL;
std::vector<FileEntry *> *files = NULL;
for( unsigned int i = 0; i < fileTable.size(); ++i )
{
@@ -373,7 +373,7 @@ vector<FileEntry *> *FileHeader::getFilesWithPrefix(const std::wstring &prefix)
{
if( files == NULL )
{
files = new vector<FileEntry *>();
files = new std::vector<FileEntry *>();
}
files->push_back(fileTable[i]);
@@ -431,7 +431,7 @@ static wchar_t* findFilenameStart(wchar_t* str)
std::wstring FileHeader::getPlayerDataFilenameForLoad(const PlayerUID& pUID)
{
std::wstring retVal = L"";
vector<FileEntry*>* pFiles = getDatFilesWithOnlineID(pUID);
std::vector<FileEntry*>* pFiles = getDatFilesWithOnlineID(pUID);
if(!pFiles)
{
// we didn't find a matching online dat file, so look for an offline version
@@ -461,7 +461,7 @@ std::wstring FileHeader::getPlayerDataFilenameForSave(const PlayerUID& pUID)
if(pUID.isSignedIntoPSN() == false)
{
// OK, we're not online, see if we can find another data file with matching mac and userID
vector<FileEntry*>* pFiles = getDatFilesWithMacAndUserID(pUID);
std::vector<FileEntry*>* pFiles = getDatFilesWithMacAndUserID(pUID);
if(pFiles)
{
// we've found a previous save, use the filename from it, as it might have the online part too
@@ -478,9 +478,9 @@ std::wstring FileHeader::getPlayerDataFilenameForSave(const PlayerUID& pUID)
}
vector<FileEntry *> *FileHeader::getValidPlayerDatFiles()
std::vector<FileEntry *> *FileHeader::getValidPlayerDatFiles()
{
vector<FileEntry *> *files = NULL;
std::vector<FileEntry *> *files = NULL;
// find filenames that match this pattern
// P_5e7ff8372ea9_00000004_Mark_4J
@@ -512,7 +512,7 @@ vector<FileEntry *> *FileHeader::getValidPlayerDatFiles()
// if we get here, it must be a valid filename
if( files == NULL )
{
files = new vector<FileEntry *>();
files = new std::vector<FileEntry *>();
}
files->push_back(fileTable[i]);
}
@@ -522,12 +522,12 @@ vector<FileEntry *> *FileHeader::getValidPlayerDatFiles()
vector<FileEntry *> *FileHeader::getDatFilesWithOnlineID(const PlayerUID& pUID)
std::vector<FileEntry *> *FileHeader::getDatFilesWithOnlineID(const PlayerUID& pUID)
{
if(pUID.isSignedIntoPSN() == false)
return NULL;
vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
std::vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
if(datFiles == NULL)
return NULL;
@@ -536,7 +536,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithOnlineID(const PlayerUID& pUID)
wchar_t onlineIDW[64];
mbstowcs(onlineIDW, pUID.getOnlineID(), 64);
vector<FileEntry *> *files = NULL;
std::vector<FileEntry *> *files = NULL;
int onlineIDSize = wcslen(onlineIDW);
if(onlineIDSize == 0)
return NULL;
@@ -567,7 +567,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithOnlineID(const PlayerUID& pUID)
{
if( files == NULL )
{
files = new vector<FileEntry *>();
files = new std::vector<FileEntry *>();
}
files->push_back(datFiles->at(i));
}
@@ -579,10 +579,10 @@ vector<FileEntry *> *FileHeader::getDatFilesWithOnlineID(const PlayerUID& pUID)
return files;
}
vector<FileEntry *> *FileHeader::getDatFilesWithMacAndUserID(const PlayerUID& pUID)
std::vector<FileEntry *> *FileHeader::getDatFilesWithMacAndUserID(const PlayerUID& pUID)
{
vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
std::vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
if(datFiles == NULL)
return NULL;
@@ -593,7 +593,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 = NULL;
std::vector<FileEntry *> *files = NULL;
static const int macAddrStart = 2; // 2 characters into the filename
static const int userIDStart = 15; // 15 characters into the filename
@@ -612,7 +612,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithMacAndUserID(const PlayerUID& pU
{
if( files == NULL )
{
files = new vector<FileEntry *>();
files = new std::vector<FileEntry *>();
}
files->push_back(datFiles->at(i));
}
@@ -624,16 +624,16 @@ vector<FileEntry *> *FileHeader::getDatFilesWithMacAndUserID(const PlayerUID& pU
}
vector<FileEntry *> *FileHeader::getDatFilesWithPrimaryUser()
std::vector<FileEntry *> *FileHeader::getDatFilesWithPrimaryUser()
{
vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
std::vector<FileEntry *>* datFiles = getValidPlayerDatFiles();
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 = NULL;
std::vector<FileEntry *> *files = NULL;
char tempStr[128];
for( unsigned int i = 0; i < datFiles->size(); ++i )
@@ -647,7 +647,7 @@ vector<FileEntry *> *FileHeader::getDatFilesWithPrimaryUser()
{
if( files == NULL )
{
files = new vector<FileEntry *>();
files = new std::vector<FileEntry *>();
}
files->push_back(datFiles->at(i));
}