aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
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 98ff1c26..02ee7c93 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=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);
+ m_fScreenWidth=(float)pMinecraft->width_phys;
+ m_fRawWidth=(float)ssc.rawWidth;
+ m_fScreenHeight=(float)pMinecraft->height_phys;
+ m_fRawHeight=(float)ssc.rawHeight;
}
//-----------------------------------------------------------------------------
@@ -41,13 +41,13 @@ HRESULT CXuiCtrlMinecraftPlayer::OnInit(XUIMessageInit* pInitData, BOOL& rfHandl
{
XuiElementGetParent(parent,&parent);
currentClass = XuiGetObjectClass( parent );
- } while (parent != nullptr && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
+ } while (parent != NULL && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
- assert( parent != nullptr );
+ assert( parent != NULL );
VOID *pObj;
XuiObjectFromHandle( parent, &pObj );
- m_containerScene = static_cast<CXuiSceneInventory *>(pObj);
+ m_containerScene = (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] != nullptr)
+// if(pMinecraft->localplayers[i] != NULL)
// {
// iPlayerC++;
// }