aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/McRegionLevelStorageSource.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/McRegionLevelStorageSource.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/McRegionLevelStorageSource.cpp')
-rw-r--r--Minecraft.World/McRegionLevelStorageSource.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/McRegionLevelStorageSource.cpp b/Minecraft.World/McRegionLevelStorageSource.cpp
index 60904fde..bf60ee0c 100644
--- a/Minecraft.World/McRegionLevelStorageSource.cpp
+++ b/Minecraft.World/McRegionLevelStorageSource.cpp
@@ -51,12 +51,12 @@ vector<LevelSummary *> *McRegionLevelStorageSource::getLevelList()
wstring levelId = file->getName();
LevelData *levelData = getDataTagFor(levelId);
- if (levelData != NULL)
+ if (levelData != nullptr)
{
bool requiresConversion = levelData->getVersion() != McRegionLevelStorage::MCREGION_VERSION_ID;
wstring levelName = levelData->getLevelName();
- if (levelName.empty()) // 4J Jev TODO: levelName can't be NULL? if (levelName == NULL || isEmpty(levelName))
+ if (levelName.empty()) // 4J Jev TODO: levelName can't be nullptr? if (levelName == nullptr || isEmpty(levelName))
{
levelName = levelId;
}
@@ -76,14 +76,14 @@ void McRegionLevelStorageSource::clearAll()
shared_ptr<LevelStorage> McRegionLevelStorageSource::selectLevel(ConsoleSaveFile *saveFile, const wstring& levelId, bool createPlayerDir)
{
// return new LevelStorageProfilerDecorator(new McRegionLevelStorage(baseDir, levelId, createPlayerDir));
- return shared_ptr<LevelStorage>(new McRegionLevelStorage(saveFile, baseDir, levelId, createPlayerDir));
+ return std::make_shared<McRegionLevelStorage>(saveFile, baseDir, levelId, createPlayerDir);
}
bool McRegionLevelStorageSource::isConvertible(ConsoleSaveFile *saveFile, const wstring& levelId)
{
// check if there is old file format level data
LevelData *levelData = getDataTagFor(saveFile, levelId);
- if (levelData == NULL || levelData->getVersion() != 0)
+ if (levelData == nullptr || levelData->getVersion() != 0)
{
delete levelData;
return false;
@@ -96,7 +96,7 @@ bool McRegionLevelStorageSource::isConvertible(ConsoleSaveFile *saveFile, const
bool McRegionLevelStorageSource::requiresConversion(ConsoleSaveFile *saveFile, const wstring& levelId)
{
LevelData *levelData = getDataTagFor(saveFile, levelId);
- if (levelData == NULL || levelData->getVersion() != 0)
+ if (levelData == nullptr || levelData->getVersion() != 0)
{
delete levelData;
return false;
@@ -275,7 +275,7 @@ void McRegionLevelStorageSource::eraseFolders(vector<File *> *folders, int curre
folder->_delete();
currentCount++;
- int percent = (int) Math::round(100.0 * (double) currentCount / (double) totalCount);
+ int percent = static_cast<int>(Math::round(100.0 * (double)currentCount / (double)totalCount));
progress->progressStagePercentage(percent);
}
}