fix: fixed Xbox 360 build issues
This commit is contained in:
@@ -96,12 +96,14 @@ void CXuiCtrlSlotList::SetData(int m_iPad, AbstractContainerMenu* menu, int rows
|
||||
|
||||
for(int i = 0; i < slotCount; i++)
|
||||
{
|
||||
CXuiCtrlSlotItemListItem* slotControl;
|
||||
CXuiCtrlSlotItemListItem* slotControl = NULL;
|
||||
GetCXuiCtrlSlotItem(i, &slotControl);
|
||||
|
||||
slotControl->SetSlot( slotControl->m_hObj, menu->getSlot( i + startIndex ) );
|
||||
|
||||
slotControl->SetUserIndex( slotControl->m_hObj, m_iPad );
|
||||
if( slotControl != NULL )
|
||||
{
|
||||
slotControl->SetSlot( slotControl->m_hObj, menu->getSlot( i + startIndex ) );
|
||||
slotControl->SetUserIndex( slotControl->m_hObj, m_iPad );
|
||||
}
|
||||
|
||||
slotControl = NULL;
|
||||
}
|
||||
@@ -214,18 +216,28 @@ void CXuiCtrlSlotList::SetEntrySlot(int row, int column, XUI_CONTROL_NAVIGATE di
|
||||
|
||||
void CXuiCtrlSlotList::Clicked()
|
||||
{
|
||||
CXuiCtrlSlotItemListItem* slot;
|
||||
CXuiCtrlSlotItemListItem* slot = NULL;
|
||||
GetCXuiCtrlSlotItem( GetCurSel() , &slot);
|
||||
|
||||
// To get the press animation
|
||||
slot->Press();
|
||||
if( slot != NULL )
|
||||
{
|
||||
slot->Press();
|
||||
}
|
||||
}
|
||||
|
||||
void CXuiCtrlSlotList::GetCXuiCtrlSlotItem(int itemIndex, CXuiCtrlSlotItemListItem** CXuiCtrlSlotItem)
|
||||
{
|
||||
HXUIOBJ itemControl = this->GetItemControl(itemIndex);
|
||||
VOID *pObj;
|
||||
XuiObjectFromHandle( itemControl, &pObj );
|
||||
HXUIOBJ itemControl = XuiListGetItemControl( m_hObj, itemIndex );
|
||||
if( itemControl == NULL )
|
||||
{
|
||||
itemControl = this->GetItemControl( itemIndex );
|
||||
}
|
||||
|
||||
VOID *pObj = NULL;
|
||||
if( itemControl != NULL )
|
||||
{
|
||||
XuiObjectFromHandle( itemControl, &pObj );
|
||||
}
|
||||
|
||||
*CXuiCtrlSlotItem = (CXuiCtrlSlotItemListItem *)pObj;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user