aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
diff options
context:
space:
mode:
authorqwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com>2026-03-05 17:17:45 -0600
committerGitHub <noreply@github.com>2026-03-05 17:17:45 -0600
commit0666959d312dc74903f55d1071488a90239330f1 (patch)
tree5c6886f7ec65a7828bc6e34a469514e418bcf78b /Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
parent9370cbc7d878df1615d8ce76bc459e8b414d0f19 (diff)
parenteed770b121aa4ce38f002db042d0137c24c6d344 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
index 04e77e5e..6024b8d6 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
@@ -33,7 +33,7 @@ HRESULT CXuiSceneInventory::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
{
if(m_bSplitscreen)
{
- app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);
+ app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);
}
}
@@ -57,7 +57,7 @@ HRESULT CXuiSceneInventory::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
initData->player->awardStat(GenericStats::openInventory(), GenericStats::param_noArgs());
CXuiSceneAbstractContainer::Initialize( initData->iPad, menu, false, InventoryMenu::INV_SLOT_START, eSectionInventoryUsing, eSectionInventoryMax, initData->bNavigateBack );
-
+
delete initData;
float fWidth;
@@ -86,7 +86,7 @@ HRESULT CXuiSceneInventory::OnDestroy()
}
// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
- // We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)
+ // We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)
if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
return S_OK;
}
@@ -176,8 +176,8 @@ void CXuiSceneInventory::updateEffectsDisplay()
// Fill out details for display
D3DXVECTOR3 position;
m_hEffectDisplayA[0]->GetPosition(&position);
- AUTO_VAR(it, activeEffects->begin());
- for(unsigned int i = 0; i < MAX_EFFECTS; ++i)
+ auto it = activeEffects->begin();
+ for(unsigned int i = 0; i < MAX_EFFECTS; ++i)
{
if(it != activeEffects->end())
{
@@ -185,7 +185,7 @@ void CXuiSceneInventory::updateEffectsDisplay()
if(i > 0) position.y -= fNextEffectYOffset; // Stack from the bottom
m_hEffectDisplayA[i]->SetPosition(&position);
-
+
MobEffectInstance *effect = *it;
MobEffect *mobEffect = MobEffect::effects[effect->getId()];