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

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Minecraft.World/McRegionLevelStorage.cpp
View File

@@ -20,13 +20,13 @@ McRegionLevelStorage::~McRegionLevelStorage()
RegionFileCache::clear();
}
ChunkStorage *McRegionLevelStorage::createChunkStorage(Dimension *dimension)
ChunkStorage *McRegionLevelStorage::createChunkStorage(Dimension *dimension)
{
//File folder = getFolder();
if (dynamic_cast<HellDimension *>(dimension) != NULL)
{
if(app.GetResetNether())
{
#ifdef SPLIT_SAVES
@@ -34,19 +34,19 @@ ChunkStorage *McRegionLevelStorage::createChunkStorage(Dimension *dimension)
if(netherFiles!=NULL)
{
DWORD bytesWritten = 0;
for(AUTO_VAR(it, netherFiles->begin()); it != netherFiles->end(); ++it)
for(auto& netherFile : *netherFiles)
{
m_saveFile->zeroFile(*it, (*it)->getFileSize(), &bytesWritten);
m_saveFile->zeroFile(netherFile, netherFile->getFileSize(), &bytesWritten);
}
delete netherFiles;
}
#else
vector<FileEntry *> *netherFiles = m_saveFile->getFilesWithPrefix(LevelStorage::NETHER_FOLDER);
if(netherFiles!=NULL)
{
for(AUTO_VAR(it, netherFiles->begin()); it != netherFiles->end(); ++it)
{
for(auto& netherFile : *netherFiles)
{
m_saveFile->deleteFile(*it);
m_saveFile->deleteFile(netherFile);
}
delete netherFiles;
}
@@ -56,13 +56,13 @@ ChunkStorage *McRegionLevelStorage::createChunkStorage(Dimension *dimension)
return new McRegionChunkStorage(m_saveFile, LevelStorage::NETHER_FOLDER);
}
if (dynamic_cast<TheEndDimension *>(dimension))
{
//File dir2 = new File(folder, LevelStorage.ENDER_FOLDER);
//dir2.mkdirs();
//return new ThreadedMcRegionChunkStorage(dir2);
// 4J-PB - save version 0 at this point means it's a create new world
int iSaveVersion=m_saveFile->getSaveVersion();
@@ -75,10 +75,10 @@ ChunkStorage *McRegionLevelStorage::createChunkStorage(Dimension *dimension)
// 4J-PB - There will be no End in early saves
if(endFiles!=NULL)
{
for(AUTO_VAR(it, endFiles->begin()); it != endFiles->end(); ++it)
{
for(auto& endFile : *endFiles)
{
m_saveFile->deleteFile(*it);
m_saveFile->deleteFile(endFile);
}
delete endFiles;
}
@@ -89,7 +89,7 @@ ChunkStorage *McRegionLevelStorage::createChunkStorage(Dimension *dimension)
return new McRegionChunkStorage(m_saveFile, L"");
}
void McRegionLevelStorage::saveLevelData(LevelData *levelData, vector<shared_ptr<Player> > *players)
void McRegionLevelStorage::saveLevelData(LevelData *levelData, vector<shared_ptr<Player> > *players)
{
levelData->setVersion(MCREGION_VERSION_ID);
MemSect(38);
@@ -97,7 +97,7 @@ void McRegionLevelStorage::saveLevelData(LevelData *levelData, vector<shared_ptr
MemSect(0);
}
void McRegionLevelStorage::closeAll()
void McRegionLevelStorage::closeAll()
{
RegionFileCache::clear();
}