aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/ConnectScreen.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/ConnectScreen.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/ConnectScreen.cpp')
-rw-r--r--Minecraft.Client/ConnectScreen.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.Client/ConnectScreen.cpp b/Minecraft.Client/ConnectScreen.cpp
index 2cf005b6..18d50a52 100644
--- a/Minecraft.Client/ConnectScreen.cpp
+++ b/Minecraft.Client/ConnectScreen.cpp
@@ -12,12 +12,12 @@ ConnectScreen::ConnectScreen(Minecraft *minecraft, const wstring& ip, int port)
{
aborted = false;
// System.out.println("Connecting to " + ip + ", " + port);
- minecraft->setLevel(NULL);
+ minecraft->setLevel(nullptr);
#if 1
// 4J - removed from separate thread, but need to investigate what we actually need here
connection = new ClientConnection(minecraft, ip, port);
if (aborted) return;
- connection->send( shared_ptr<PreLoginPacket>( new PreLoginPacket(minecraft->user->name) ) );
+ connection->send(std::make_shared<PreLoginPacket>(minecraft->user->name));
#else
new Thread() {
@@ -45,7 +45,7 @@ ConnectScreen::ConnectScreen(Minecraft *minecraft, const wstring& ip, int port)
void ConnectScreen::tick()
{
- if (connection != NULL)
+ if (connection != nullptr)
{
connection->tick();
}
@@ -69,7 +69,7 @@ void ConnectScreen::buttonClicked(Button *button)
if (button->id == 0)
{
aborted = true;
- if (connection != NULL) connection->close();
+ if (connection != nullptr) connection->close();
minecraft->setScreen(new TitleScreen());
}
}
@@ -80,7 +80,7 @@ void ConnectScreen::render(int xm, int ym, float a)
Language *language = Language::getInstance();
- if (connection == NULL)
+ if (connection == nullptr)
{
drawCenteredString(font, language->getElement(L"connect.connecting"), width / 2, height / 2 - 50, 0xffffff);
drawCenteredString(font, L"", width / 2, height / 2 - 10, 0xffffff);