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:
@@ -103,7 +103,7 @@ void CXuiCtrlSlotList::SetData(int m_iPad, AbstractContainerMenu* menu, int rows
|
||||
|
||||
slotControl->SetUserIndex( slotControl->m_hObj, m_iPad );
|
||||
|
||||
slotControl = NULL;
|
||||
slotControl = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,6 +226,6 @@ void CXuiCtrlSlotList::GetCXuiCtrlSlotItem(int itemIndex, CXuiCtrlSlotItemListIt
|
||||
HXUIOBJ itemControl = this->GetItemControl(itemIndex);
|
||||
VOID *pObj;
|
||||
XuiObjectFromHandle( itemControl, &pObj );
|
||||
*CXuiCtrlSlotItem = (CXuiCtrlSlotItemListItem *)pObj;
|
||||
*CXuiCtrlSlotItem = static_cast<CXuiCtrlSlotItemListItem *>(pObj);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user