fix: fixed Xbox 360 build issues
This commit is contained in:
@@ -308,15 +308,21 @@ void CXuiSceneAbstractContainer::GetItemScreenData( ESceneSection eSection, int
|
||||
|
||||
shared_ptr<ItemInstance> CXuiSceneAbstractContainer::getSlotItem(ESceneSection eSection, int iSlot)
|
||||
{
|
||||
CXuiCtrlSlotList *slotList = GetSectionSlotList( eSection );
|
||||
if(slotList == NULL) return NULL;
|
||||
CXuiCtrlSlotItemListItem* pCXuiCtrlSlotItem;
|
||||
GetSectionSlotList( eSection )->GetCXuiCtrlSlotItem( iSlot, &( pCXuiCtrlSlotItem ) );
|
||||
slotList->GetCXuiCtrlSlotItem( iSlot, &( pCXuiCtrlSlotItem ) );
|
||||
if(pCXuiCtrlSlotItem == NULL) return NULL;
|
||||
return pCXuiCtrlSlotItem->getItemInstance( pCXuiCtrlSlotItem->m_hObj );
|
||||
}
|
||||
|
||||
bool CXuiSceneAbstractContainer::isSlotEmpty(ESceneSection eSection, int iSlot)
|
||||
{
|
||||
CXuiCtrlSlotList *slotList = GetSectionSlotList( eSection );
|
||||
if(slotList == NULL) return true;
|
||||
CXuiCtrlSlotItemListItem* pCXuiCtrlSlotItem;
|
||||
GetSectionSlotList( eSection )->GetCXuiCtrlSlotItem( iSlot, &( pCXuiCtrlSlotItem ) );
|
||||
slotList->GetCXuiCtrlSlotItem( iSlot, &( pCXuiCtrlSlotItem ) );
|
||||
if(pCXuiCtrlSlotItem == NULL) return true;
|
||||
return pCXuiCtrlSlotItem->isEmpty( pCXuiCtrlSlotItem->m_hObj );
|
||||
}
|
||||
|
||||
@@ -438,6 +444,37 @@ void CXuiSceneAbstractContainer::SetPointerText(const wstring &description, vect
|
||||
XuiElementSetShow(m_hPointerText,TRUE);
|
||||
}
|
||||
|
||||
void CXuiSceneAbstractContainer::SetPointerText(vector<HtmlString> *description, bool newSlot)
|
||||
{
|
||||
if(description == NULL || description->empty())
|
||||
{
|
||||
m_pointerControl->SetText(L"");
|
||||
XuiElementSetShow(m_hPointerText,FALSE);
|
||||
XuiElementSetShow(m_hPointerTextBkg,FALSE);
|
||||
return;
|
||||
}
|
||||
|
||||
wstring combinedText;
|
||||
for(size_t i = 0; i < description->size(); ++i)
|
||||
{
|
||||
combinedText += (*description)[i].text;
|
||||
if(i + 1 < description->size()) combinedText += L"\n";
|
||||
}
|
||||
|
||||
vector<wstring> unformattedStrings;
|
||||
for(size_t i = 0; i < description->size(); ++i)
|
||||
{
|
||||
unformattedStrings.push_back((*description)[i].text);
|
||||
}
|
||||
|
||||
SetPointerText(combinedText, unformattedStrings, newSlot);
|
||||
}
|
||||
|
||||
Slot *CXuiSceneAbstractContainer::getSlot(ESceneSection eSection, int iSlot)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void CXuiSceneAbstractContainer::adjustPointerForSafeZone()
|
||||
{
|
||||
D3DXVECTOR2 baseSceneOrigin;
|
||||
|
||||
Reference in New Issue
Block a user