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:
@@ -10,9 +10,9 @@
|
||||
HRESULT CScene_SettingsAll::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
|
||||
{
|
||||
//WCHAR TempString[256];
|
||||
m_iPad=*(int *)pInitData->pvInitData;
|
||||
m_iPad=*static_cast<int *>(pInitData->pvInitData);
|
||||
// if we're not in the game, we need to use basescene 0
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
|
||||
|
||||
MapChildControls();
|
||||
|
||||
@@ -112,7 +112,7 @@ HRESULT CScene_SettingsAll::OnControlNavigate(XUIMessageControlNavigate *pContro
|
||||
// added so we can skip greyed out items
|
||||
pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
|
||||
|
||||
if(pControlNavigateData->hObjDest!=NULL)
|
||||
if(pControlNavigateData->hObjDest!=nullptr)
|
||||
{
|
||||
bHandled=TRUE;
|
||||
}
|
||||
@@ -181,7 +181,7 @@ HRESULT CScene_SettingsAll::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
|
||||
|
||||
HRESULT CScene_SettingsAll::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
|
||||
{
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
|
||||
|
||||
// if we're not in the game, we need to use basescene 0
|
||||
if(bNotInGame)
|
||||
|
||||
Reference in New Issue
Block a user