aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.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_4JList.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_4JList.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp
index 7523c523..4c615979 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp
@@ -7,7 +7,7 @@ HRESULT CXuiCtrl4JList::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
{
InitializeCriticalSection(&m_AccessListData);
- m_hSelectionChangedHandlerObj = nullptr;
+ m_hSelectionChangedHandlerObj = NULL;
return S_OK;
}
@@ -22,13 +22,13 @@ void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFrom
if(ItemInfo.pwszText)
{
- dwLen1=static_cast<int>(wcslen(ItemInfo.pwszText))*sizeof(WCHAR);
+ dwLen1=(int)wcslen(ItemInfo.pwszText)*sizeof(WCHAR);
dwBytes+=dwLen1+sizeof(WCHAR);
}
if(ItemInfo.pwszImage)
{
- dwLen2=static_cast<int>(wcslen(ItemInfo.pwszImage))*sizeof(WCHAR);
+ dwLen2=(int)(wcslen(ItemInfo.pwszImage))*sizeof(WCHAR);
dwBytes+=dwLen2+sizeof(WCHAR);
}
@@ -59,11 +59,11 @@ void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFrom
// need to remember the original index of this addition before it gets sorted - this will get used to load the game
if(iSortListFromIndex!=-1)
{
- pItemInfo->iIndex=static_cast<int>(m_vListData.size())-iSortListFromIndex;
+ pItemInfo->iIndex=(int)m_vListData.size()-iSortListFromIndex;
}
else
{
- pItemInfo->iIndex=static_cast<int>(m_vListData.size());
+ pItemInfo->iIndex=(int)m_vListData.size();
}
// added to force a sort order for DLC
@@ -110,7 +110,7 @@ void CXuiCtrl4JList::RemoveAllData( )
{
EnterCriticalSection(&m_AccessListData);
- int iSize=static_cast<int>(m_vListData.size());
+ int iSize=(int)m_vListData.size();
for(int i=0;i<iSize;i++)
{
LIST_ITEM_INFO *pBack = m_vListData.back();
@@ -304,7 +304,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceT
HRESULT CXuiCtrl4JList::OnGetItemCountAll(XUIMessageGetItemCount *pGetItemCountData,BOOL& bHandled)
{
- pGetItemCountData->cItems = static_cast<int>(m_vListData.size());
+ pGetItemCountData->cItems = (int)m_vListData.size();
bHandled = TRUE;
return S_OK;
}
@@ -315,7 +315,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourc
{
// Check for a brush
EnterCriticalSection(&m_AccessListData);
- if(GetData(pGetSourceImageData->iItem).hXuiBrush!=nullptr)
+ if(GetData(pGetSourceImageData->iItem).hXuiBrush!=NULL)
{
pGetSourceImageData->hBrush=GetData(pGetSourceImageData->iItem).hXuiBrush;
}