Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

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());
     }
 }