aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/SelectWorldScreen.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.Client/SelectWorldScreen.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.Client/SelectWorldScreen.cpp')
-rw-r--r--Minecraft.Client/SelectWorldScreen.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/Minecraft.Client/SelectWorldScreen.cpp b/Minecraft.Client/SelectWorldScreen.cpp
index ebae8c83..c6d417c5 100644
--- a/Minecraft.Client/SelectWorldScreen.cpp
+++ b/Minecraft.Client/SelectWorldScreen.cpp
@@ -16,11 +16,11 @@ SelectWorldScreen::SelectWorldScreen(Screen *lastScreen)
title = L"Select world";
done = false;
selectedWorld = 0;
- worldSelectionList = NULL;
+ worldSelectionList = nullptr;
isDeleting = false;
- deleteButton = NULL;
- selectButton = NULL;
- renameButton = NULL;
+ deleteButton = nullptr;
+ selectButton = nullptr;
+ renameButton = nullptr;
this->lastScreen = lastScreen;
}
@@ -115,14 +115,14 @@ void SelectWorldScreen::buttonClicked(Button *button)
else
{
// create demo world
- minecraft->setScreen(NULL);
+ minecraft->setScreen(nullptr);
if (done) return;
done = true;
// 4J Stu - Not used, so commenting to stop the build failing
#if 0
minecraft->gameMode = new DemoMode(minecraft);
minecraft->selectLevel(CreateWorldScreen::findAvailableFolderName(minecraft->getLevelSource(), L"Demo"), L"Demo World", 0L);
- minecraft->setScreen(NULL);
+ minecraft->setScreen(nullptr);
#endif
}
}
@@ -142,20 +142,20 @@ void SelectWorldScreen::buttonClicked(Button *button)
void SelectWorldScreen::worldSelected(int id)
{
- minecraft->setScreen(NULL);
+ minecraft->setScreen(nullptr);
if (done) return;
done = true;
- minecraft->gameMode = NULL; //new SurvivalMode(minecraft);
+ minecraft->gameMode = nullptr; //new SurvivalMode(minecraft);
wstring worldFolderName = getWorldId(id);
- if (worldFolderName == L"") // 4J - was NULL comparison
+ if (worldFolderName == L"") // 4J - was nullptr comparison
{
worldFolderName = L"World" + std::to_wstring(id);
}
// 4J Stu - Not used, so commenting to stop the build failing
#if 0
minecraft->selectLevel(worldFolderName, getWorldName(id), 0);
- minecraft->setScreen(NULL);
+ minecraft->setScreen(nullptr);
#endif
}
@@ -235,7 +235,7 @@ SelectWorldScreen::WorldSelectionList::WorldSelectionList(SelectWorldScreen *sws
int SelectWorldScreen::WorldSelectionList::getNumberOfItems()
{
- return (int)this->parent->levelList->size();
+ return static_cast<int>(this->parent->levelList->size());
}
void SelectWorldScreen::WorldSelectionList::selectItem(int item, bool doubleClick)
@@ -259,7 +259,7 @@ bool SelectWorldScreen::WorldSelectionList::isSelectedItem(int item)
int SelectWorldScreen::WorldSelectionList::getMaxPosition()
{
- return (int)parent->levelList->size() * 36;
+ return static_cast<int>(parent->levelList->size()) * 36;
}
void SelectWorldScreen::WorldSelectionList::renderBackground()