diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.cpp index 08bd0550b..2c59a0cdd 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.cpp @@ -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; } - diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp index 459c2562d..79d64a674 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp @@ -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 ); diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Debug.h b/Minecraft.Client/Platform/Common/XUI/XUI_Debug.h index 1fa6d3c86..955c80e25 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_Debug.h +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Debug.h @@ -35,7 +35,7 @@ private: typedef struct { HXUIOBJ hXuiObj; - VOID *pvData; + void *pvData; } DEBUGDATA; diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.cpp index 867a2171c..68acf8a43 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.cpp @@ -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]; diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp index 03a5a4d46..c4bc86e33 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp @@ -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; -} \ No newline at end of file +} diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.cpp index 0c7a89edb..41f489a98 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.cpp @@ -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); diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp index 6b14c14dd..875696a44 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp @@ -904,7 +904,7 @@ void CScene_Leaderboards::PopulateLeaderboard(bool noResults) if(m_pHTitleIconSlots[0]==NULL) { - VOID *pObj; + void *pObj; HXUIOBJ button; D3DXVECTOR3 vPos; diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp index 5f7c468b0..0b1cb7633 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp @@ -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; diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.cpp index ceee39d22..327f8d843 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.cpp @@ -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); -} \ No newline at end of file +} diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp index 839698dbd..b0c872d35 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp @@ -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; } -