Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -71,8 +71,8 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
|
||||
m_fPointerMaxX = fPanelWidth + fPointerWidth;
|
||||
m_fPointerMaxY = fPanelHeight + (fPointerHeight/2);
|
||||
|
||||
// m_hPointerText=NULL;
|
||||
// m_hPointerTextBkg=NULL;
|
||||
// m_hPointerText=nullptr;
|
||||
// m_hPointerTextBkg=nullptr;
|
||||
|
||||
UIVec2D itemPos;
|
||||
UIVec2D itemSize;
|
||||
@@ -113,7 +113,7 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
|
||||
// Disable the default navigation behaviour for all slot lsit items (prevent old style cursor navigation).
|
||||
for ( int iSection = m_eFirstSection; iSection < m_eMaxSection; ++iSection )
|
||||
{
|
||||
ESceneSection eSection = ( ESceneSection )( iSection );
|
||||
ESceneSection eSection = static_cast<ESceneSection>(iSection);
|
||||
|
||||
if(!IsSectionSlotList(eSection)) continue;
|
||||
|
||||
@@ -170,7 +170,7 @@ HRESULT CXuiSceneAbstractContainer::OnTransitionStart( XUIMessageTransition *pTr
|
||||
InitDataAssociations(m_iPad, m_menu);
|
||||
}
|
||||
|
||||
HXUIOBJ hObj=NULL;
|
||||
HXUIOBJ hObj=nullptr;
|
||||
HRESULT hr=XuiControlGetVisual(m_pointerControl->m_hObj,&hObj);
|
||||
hr=XuiElementGetChildById(hObj,L"text_measurer",&m_hPointerTextMeasurer);
|
||||
hr=XuiElementGetChildById(hObj,L"text_name",&m_hPointerText);
|
||||
|
||||
Reference in New Issue
Block a user