aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
index 2692c8f1..03e783f4 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
@@ -71,8 +71,8 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
m_fPointerMaxX = fPanelWidth + fPointerWidth;
m_fPointerMaxY = fPanelHeight + (fPointerHeight/2);
-// m_hPointerText=nullptr;
-// m_hPointerTextBkg=nullptr;
+// m_hPointerText=NULL;
+// m_hPointerTextBkg=NULL;
UIVec2D itemPos;
UIVec2D itemSize;
@@ -113,7 +113,7 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
// Disable the default navigation behaviour for all slot lsit items (prevent old style cursor navigation).
for ( int iSection = m_eFirstSection; iSection < m_eMaxSection; ++iSection )
{
- ESceneSection eSection = static_cast<ESceneSection>(iSection);
+ ESceneSection eSection = ( ESceneSection )( iSection );
if(!IsSectionSlotList(eSection)) continue;
@@ -170,7 +170,7 @@ HRESULT CXuiSceneAbstractContainer::OnTransitionStart( XUIMessageTransition *pTr
InitDataAssociations(m_iPad, m_menu);
}
- HXUIOBJ hObj=nullptr;
+ HXUIOBJ hObj=NULL;
HRESULT hr=XuiControlGetVisual(m_pointerControl->m_hObj,&hObj);
hr=XuiElementGetChildById(hObj,L"text_measurer",&m_hPointerTextMeasurer);
hr=XuiElementGetChildById(hObj,L"text_name",&m_hPointerText);