aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/ChatScreen.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-07 21:56:03 -0500
committerGitHub <noreply@github.com>2026-03-08 09:56:03 +0700
commita9be52c41a02d207233199e98898fe7483d7e817 (patch)
tree71dfaec3a86b05e9ca409b97d8eb9d7f993bfdd0 /Minecraft.Client/ChatScreen.cpp
parent1be5faaea781402e7de06b263eeca4c688b7712c (diff)
Project modernization (#630)
* 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
Diffstat (limited to 'Minecraft.Client/ChatScreen.cpp')
-rw-r--r--Minecraft.Client/ChatScreen.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp
index 543cab76..53c90722 100644
--- a/Minecraft.Client/ChatScreen.cpp
+++ b/Minecraft.Client/ChatScreen.cpp
@@ -87,7 +87,7 @@ void ChatScreen::keyPressed(wchar_t ch, int eventKey)
{
if (eventKey == Keyboard::KEY_ESCAPE)
{
- minecraft->setScreen(NULL);
+ minecraft->setScreen(nullptr);
return;
}
if (eventKey == Keyboard::KEY_RETURN)
@@ -108,7 +108,7 @@ void ChatScreen::keyPressed(wchar_t ch, int eventKey)
s_chatHistory.erase(s_chatHistory.begin());
}
}
- minecraft->setScreen(NULL);
+ minecraft->setScreen(nullptr);
return;
}
if (eventKey == Keyboard::KEY_UP) { handleHistoryUp(); return; }
@@ -160,7 +160,7 @@ void ChatScreen::mouseClicked(int x, int y, int buttonNum)
{
if (buttonNum == 0)
{
- if (minecraft->gui->selectedName != L"") // 4J - was NULL comparison
+ if (minecraft->gui->selectedName != L"") // 4J - was nullptr comparison
{
if (message.length() > 0 && message[message.length()-1]!=L' ')
{