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:
@@ -386,12 +386,12 @@ static const int gs_aNumTextElements[ eNumTextTypes ] =
|
||||
//----------------------------------------------------------------------------------
|
||||
HRESULT CScene_Credits::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
|
||||
{
|
||||
int iPad = *(int *)pInitData->pvInitData;
|
||||
int iPad = *static_cast<int *>(pInitData->pvInitData);
|
||||
|
||||
MapChildControls();
|
||||
|
||||
// if we're not in the game, we need to use basescene 0
|
||||
if(Minecraft::GetInstance()->level==NULL)
|
||||
if(Minecraft::GetInstance()->level==nullptr)
|
||||
{
|
||||
iPad=0;
|
||||
}
|
||||
@@ -441,7 +441,7 @@ HRESULT CScene_Credits::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
|
||||
|
||||
VOID* pTextObj;
|
||||
XuiObjectFromHandle( text, &pTextObj );
|
||||
m_aTextTypes[ i ].m_appTextElements[ j ] = (CXuiControl *)pTextObj;
|
||||
m_aTextTypes[ i ].m_appTextElements[ j ] = static_cast<CXuiControl *>(pTextObj);
|
||||
m_aTextTypes[ i ].m_appTextElements[ j ]->SetShow( false );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user