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:
@@ -28,7 +28,7 @@ HRESULT CScene_MultiGameLaunchMoreOptions::OnInit( XUIMessageInit* pInitData, BO
|
||||
XuiControlSetText(m_CheckboxFlatWorld,app.GetString(IDS_SUPERFLAT_WORLD));
|
||||
XuiControlSetText(m_CheckboxBonusChest,app.GetString(IDS_BONUS_CHEST));
|
||||
|
||||
m_params = (LaunchMoreOptionsMenuInitData *)pInitData->pvInitData;
|
||||
m_params = static_cast<LaunchMoreOptionsMenuInitData *>(pInitData->pvInitData);
|
||||
|
||||
if(m_params->bGenerateOptions)
|
||||
{
|
||||
@@ -231,7 +231,7 @@ HRESULT CScene_MultiGameLaunchMoreOptions::OnControlNavigate(XUIMessageControlNa
|
||||
{
|
||||
pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
|
||||
|
||||
if(pControlNavigateData->hObjDest!=NULL)
|
||||
if(pControlNavigateData->hObjDest!=nullptr)
|
||||
{
|
||||
bHandled=TRUE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user