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:
@@ -5,7 +5,7 @@
|
||||
|
||||
HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
|
||||
{
|
||||
m_iPad = *(int *)pInitData->pvInitData;
|
||||
m_iPad = *static_cast<int *>(pInitData->pvInitData);
|
||||
|
||||
MapChildControls();
|
||||
|
||||
@@ -37,7 +37,7 @@ HRESULT CScene_Chat::OnTimer( XUIMessageTimer *pXUIMessageTimer, BOOL &bHandled)
|
||||
m_Labels[i].SetOpacity(0);
|
||||
}
|
||||
}
|
||||
if(pMinecraft->localplayers[m_iPad]!= NULL)
|
||||
if(pMinecraft->localplayers[m_iPad]!= nullptr)
|
||||
{
|
||||
m_Jukebox.SetText( pGui->getJukeboxMessage(m_iPad).c_str() );
|
||||
m_Jukebox.SetOpacity( pGui->getJukeboxOpacity(m_iPad) );
|
||||
|
||||
Reference in New Issue
Block a user