backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-25 00:52:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove WinAPI object pointers from XUI scenes

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-14 07:25:18 +11:00
parent a76d416473
commit eb524ae9b8
10 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.cpp
View file

@ -224,8 +224,7 @@ void CXuiCtrlSlotList::Clicked()
void CXuiCtrlSlotList::GetCXuiCtrlSlotItem(int itemIndex, CXuiCtrlSlotItemListItem** CXuiCtrlSlotItem)
{
HXUIOBJ itemControl = this->GetItemControl(itemIndex);
VOID *pObj;
void *pObj;
XuiObjectFromHandle( itemControl, &pObj );
*CXuiCtrlSlotItem = (CXuiCtrlSlotItemListItem *)pObj;
}

4
Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp
View file

@ -37,7 +37,7 @@ HRESULT CScene_DLCMain::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
m_Timer.SetShow(FALSE);
m_bIgnoreInput=false;
VOID *pObj;
void *pObj;
XuiObjectFromHandle( xList, &pObj );
list = (CXuiCtrl4JList *) pObj;
@ -222,7 +222,7 @@ HRESULT CScene_DLCOffers::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
m_bIgnorePress=true;
VOID *pObj;
void *pObj;
m_hXuiBrush=NULL;
XuiObjectFromHandle( m_List, &pObj );

2
Minecraft.Client/Platform/Common/XUI/XUI_Debug.h
View file

@ -35,7 +35,7 @@ private:
typedef struct
{
HXUIOBJ hXuiObj;
VOID *pvData;
void *pvData;
}
DEBUGDATA;

2
Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.cpp
View file

@ -163,7 +163,7 @@ HRESULT CScene_Controls::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
}
// fill out the layouts list
VOID *pObj;
void *pObj;
XuiObjectFromHandle( m_SchemeList, &pObj );
m_pLayoutList = (CXuiCtrl4JList *)pObj;
CXuiCtrl4JList::LIST_ITEM_INFO ListInfo[3];

4
Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp
View file

@ -439,7 +439,7 @@ HRESULT CScene_Credits::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
HXUIOBJ text;
GetChildById( idString, &text );
VOID* pTextObj;
void *pTextObj;
XuiObjectFromHandle( text, &pTextObj );
m_aTextTypes[ i ].m_appTextElements[ j ] = (CXuiControl *)pTextObj;
m_aTextTypes[ i ].m_appTextElements[ j ]->SetShow( false );
@ -685,4 +685,4 @@ HRESULT CScene_Credits::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
bHandled = TRUE;
}
return S_OK;
}
}

2
Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.cpp
View file

@ -357,7 +357,7 @@ void CScene_InGamePlayerOptions::OnPlayerChanged(void *callbackParam, INetworkPl
HXUIOBJ hBackScene = scene->GetBackScene();
CScene_InGameInfo* infoScene;
VOID *pObj;
void *pObj;
XuiObjectFromHandle( hBackScene, &pObj );
infoScene = (CScene_InGameInfo *)pObj;
if(infoScene != NULL) CScene_InGameInfo::OnPlayerChanged(infoScene,pPlayer,leaving);

2
Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
View file

@ -904,7 +904,7 @@ void CScene_Leaderboards::PopulateLeaderboard(bool noResults)
if(m_pHTitleIconSlots[0]==NULL)
{
VOID *pObj;
void *pObj;
HXUIOBJ button;
D3DXVECTOR3 vPos;

4
Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
View file

@ -93,7 +93,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
m_iSaveInfoC=0;
VOID *pObj;
void *pObj;
XuiObjectFromHandle( m_SavesList, &pObj );
m_pSavesList = (CXuiCtrl4JList *)pObj;
@ -2512,7 +2512,7 @@ HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCInstalled()
HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCMountingComplete()
{
VOID *pObj;
void *pObj;
XuiObjectFromHandle( m_SavesList, &pObj );
m_pSavesList = (CXuiCtrl4JList *)pObj;

4
Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.cpp
View file

@ -39,7 +39,7 @@ HRESULT CXuiSceneCraftingPanel::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
m_bIgnoreKeyPresses=true;
D3DXVECTOR3 vec;
VOID *pObj;
void *pObj;
CraftingPanelScreenInput* pCraftingPanelData = (CraftingPanelScreenInput*)pInitData->pvInitData;
m_iContainerType=pCraftingPanelData->iContainerType;
m_pPlayer=pCraftingPanelData->player;
@ -633,4 +633,4 @@ void CXuiSceneCraftingPanel::updateVSlotPositions(int iSlots, int i)
vec.x=m_vSlot0Pos.x + m_iCurrentSlotHIndex*m_fSlotSize;
vec.z=0.0f;
m_pVSlotsBrushImageControl[i]->SetPosition(&vec);
}
}

3
Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
View file

@ -24,7 +24,7 @@ HRESULT CScene_TransferToXboxOne::OnInit( XUIMessageInit* pInitData, BOOL& bHand
m_bIgnoreInput=false;
MapChildControls();
VOID *pObj;
void *pObj;
XuiObjectFromHandle( m_SavesSlotList, &pObj );
m_pSavesSlotList = (CXuiCtrl4JList *)pObj;
@ -566,4 +566,3 @@ HRESULT CScene_TransferToXboxOne::OnNotifyKillFocus(HXUIOBJ hObjSource, XUINotif
return S_OK;
}