LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-04 03:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from 4jcraft/refactor/no-std-wildcard

Browse Source 
refactor: remove `using namespace std`
This commit is contained in:
Tropical
2026-03-08 10:09:33 -05:00
committed by GitHub
parent a508412246 06ca3c6b78
commit 43a28fc490
1972 changed files with 11580 additions and 11580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Minecraft.World/IO/Files/ConsoleSaveFileConverter.cpp
View File

@@ -59,7 +59,7 @@ void ConsoleSaveFileConverter::ProcessStandardRegionFile(ConsoleSaveFile *source
void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleSaveFile *targetSave, ProgressListener *progress)
{
// Process level.dat
ConsoleSavePath ldatPath( wstring(L"level.dat") );
ConsoleSavePath ldatPath( std::wstring(L"level.dat") );
FileEntry *sourceLdatFe = sourceSave->createFile( ldatPath );
FileEntry *targetLdatFe = targetSave->createFile( ldatPath );
printf("Processing level.dat\n");
@@ -79,9 +79,9 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
// MGH added - find any player data files and copy them across
#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
vector<FileEntry *>* playerFiles = sourceSave->getValidPlayerDatFiles();
std::vector<FileEntry *>* playerFiles = sourceSave->getValidPlayerDatFiles();
#else
vector<FileEntry *> *playerFiles = sourceSave->getFilesWithPrefix( DirectoryLevelStorage::getPlayerDir() );
std::vector<FileEntry *> *playerFiles = sourceSave->getFilesWithPrefix( DirectoryLevelStorage::getPlayerDir() );
#endif
if(playerFiles != NULL)
@@ -267,14 +267,14 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
#else
// 4J Stu - Old version that just changes the compression of chunks, not usable for XboxOne style split saves or compressed tile formats
// Process region files
vector<FileEntry *> *allFilesInSave = sourceSave->getFilesWithPrefix(wstring(L""));
std::vector<FileEntry *> *allFilesInSave = sourceSave->getFilesWithPrefix(std::wstring(L""));
for(AUTO_VAR(it, allFilesInSave->begin()); it < allFilesInSave->end(); ++it)
{
FileEntry *fe = *it;
if( fe != sourceLdatFe )
{
wstring fName( fe->data.filename );
wstring suffix(L".mcr");
std::wstring fName( fe->data.filename );
std::wstring suffix(L".mcr");
if( fName.compare(fName.length() - suffix.length(), suffix.length(), suffix) == 0 )
{
#ifndef _CONTENT_PACKAGE