aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_Chat.cpp
diff options
context:
space:
mode:
authorqwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com>2026-03-16 21:44:26 -0500
committerGitHub <noreply@github.com>2026-03-16 21:44:26 -0500
commitce739f6045ec72127491286ea3f3f21e537c1b55 (patch)
treef33bd42a47c1b4a7b2153a7fb77127ee3b407db9 /Minecraft.Client/Common/XUI/XUI_Chat.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.Client/Common/XUI/XUI_Chat.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_Chat.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.cpp b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
index 3e3faa77..64005621 100644
--- a/Minecraft.Client/Common/XUI/XUI_Chat.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
@@ -5,7 +5,7 @@
HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
- m_iPad = *(int *)pInitData->pvInitData;
+ m_iPad = *static_cast<int *>(pInitData->pvInitData);
MapChildControls();
@@ -37,7 +37,7 @@ HRESULT CScene_Chat::OnTimer( XUIMessageTimer *pXUIMessageTimer, BOOL &bHandled)
m_Labels[i].SetOpacity(0);
}
}
- if(pMinecraft->localplayers[m_iPad]!= NULL)
+ if(pMinecraft->localplayers[m_iPad]!= nullptr)
{
m_Jukebox.SetText( pGui->getJukeboxMessage(m_iPad).c_str() );
m_Jukebox.SetOpacity( pGui->getJukeboxOpacity(m_iPad) );