diff options
| author | void_17 <61356189+void2012@users.noreply.github.com> | 2026-03-06 02:11:18 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-06 02:11:18 +0700 |
| commit | 55231bb8d3e1a4e2752ac3d444c4287eb0ca4e8b (patch) | |
| tree | 953c537a5c66e328e9f4ab29626cf738112d53c0 /Minecraft.World/McRegionLevelStorage.cpp | |
| parent | 7d6658fe5b3095f35093701b5ab669ffc291e875 (diff) | |
Remove AUTO_VAR macro and _toString function (#592)
Diffstat (limited to 'Minecraft.World/McRegionLevelStorage.cpp')
| -rw-r--r-- | Minecraft.World/McRegionLevelStorage.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Minecraft.World/McRegionLevelStorage.cpp b/Minecraft.World/McRegionLevelStorage.cpp index 687ee048..daf6a7ef 100644 --- a/Minecraft.World/McRegionLevelStorage.cpp +++ b/Minecraft.World/McRegionLevelStorage.cpp @@ -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(); }
\ No newline at end of file |