From 28614b922fb77149a54da1a87bebfbc98736f296 Mon Sep 17 00:00:00 2001
From: ModMaker101 <119018978+ModMaker101@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:08:36 -0400
Subject: 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
---
 Minecraft.Client/DeathScreen.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Minecraft.Client/DeathScreen.cpp')

diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp
index e7ab1328..0e9cfb19 100644
--- a/Minecraft.Client/DeathScreen.cpp
+++ b/Minecraft.Client/DeathScreen.cpp
@@ -11,7 +11,7 @@ void DeathScreen::init()
     buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 3, L"Respawn"));
     buttons.push_back(new Button(2, width / 2 - 100, height / 4 + 24 * 4, L"Title menu"));
 
-    if (minecraft->user == NULL)
+    if (minecraft->user == nullptr)
 	{
         buttons[1]->active = false;
     }
@@ -30,12 +30,12 @@ void DeathScreen::buttonClicked(Button *button)
     if (button->id == 1)
 	{
         minecraft->player->respawn();
-        minecraft->setScreen(NULL);
+        minecraft->setScreen(nullptr);
         //          minecraft.setScreen(new NewLevelScreen(this));
     }
     if (button->id == 2)
 	{
-        minecraft->setLevel(NULL);
+        minecraft->setLevel(nullptr);
         minecraft->setScreen(new TitleScreen());
     }
 }
-- 
cgit v1.2.3