aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.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/Common/XUI/XUI_HelpAndOptions.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/Common/XUI/XUI_HelpAndOptions.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
index 9ba49e9d..f33d1d91 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
@@ -12,8 +12,8 @@
//----------------------------------------------------------------------------------
HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
- m_iPad = *(int *)pInitData->pvInitData;
- bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+ m_iPad = *static_cast<int *>(pInitData->pvInitData);
+ bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
MapChildControls();
XuiControlSetText(m_Buttons[BUTTON_HAO_CHANGESKIN],app.GetString(IDS_CHANGE_SKIN));
@@ -140,7 +140,7 @@ HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
/*HRESULT CScene_HelpAndOptions::OnTMSDLCFileRetrieved( )
{
- bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+ bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
m_Timer.SetShow(FALSE);
m_bIgnoreInput=false;
@@ -253,7 +253,7 @@ HRESULT CScene_HelpAndOptions::OnControlNavigate(XUIMessageControlNavigate *pCon
{
pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
- if(pControlNavigateData->hObjDest!=NULL)
+ if(pControlNavigateData->hObjDest!=nullptr)
{
bHandled=TRUE;
}
@@ -344,7 +344,7 @@ HRESULT CScene_HelpAndOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa
HRESULT CScene_HelpAndOptions::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
{
- bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+ bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
if(bNotInGame)
{
@@ -414,7 +414,7 @@ HRESULT CScene_HelpAndOptions::OnTransitionStart( XUIMessageTransition *pTransit
// 4J-PB - Going to resize buttons if the text is too big to fit on any of them (Br-pt problem with the length of Unlock Full Game)
XUIRect xuiRect;
- HXUIOBJ visual=NULL;
+ HXUIOBJ visual=nullptr;
HXUIOBJ text;
float fMaxTextLen=0.0f;
float fTextVisualLen;