aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.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/Common/XUI/XUI_Ctrl_MinecraftPlayer.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/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
index 02ee7c93..98ff1c26 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
@@ -22,10 +22,10 @@ CXuiCtrlMinecraftPlayer::CXuiCtrlMinecraftPlayer() :
Minecraft *pMinecraft=Minecraft::GetInstance();
ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
- m_fScreenWidth=(float)pMinecraft->width_phys;
- m_fRawWidth=(float)ssc.rawWidth;
- m_fScreenHeight=(float)pMinecraft->height_phys;
- m_fRawHeight=(float)ssc.rawHeight;
+ m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+ m_fRawWidth=static_cast<float>(ssc.rawWidth);
+ m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+ m_fRawHeight=static_cast<float>(ssc.rawHeight);
}
//-----------------------------------------------------------------------------
@@ -41,13 +41,13 @@ HRESULT CXuiCtrlMinecraftPlayer::OnInit(XUIMessageInit* pInitData, BOOL& rfHandl
{
XuiElementGetParent(parent,&parent);
currentClass = XuiGetObjectClass( parent );
- } while (parent != NULL && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
+ } while (parent != nullptr && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
- assert( parent != NULL );
+ assert( parent != nullptr );
VOID *pObj;
XuiObjectFromHandle( parent, &pObj );
- m_containerScene = (CXuiSceneInventory *)pObj;
+ m_containerScene = static_cast<CXuiSceneInventory *>(pObj);
m_iPad = m_containerScene->getPad();
@@ -116,7 +116,7 @@ HRESULT CXuiCtrlMinecraftPlayer::OnRender(XUIMessageRender *pRenderData, BOOL &b
//
// for(int i=0;i<XUSER_MAX_COUNT;i++)
// {
-// if(pMinecraft->localplayers[i] != NULL)
+// if(pMinecraft->localplayers[i] != nullptr)
// {
// iPlayerC++;
// }