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:
@@ -15,7 +15,7 @@ UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData
|
||||
m_progressBar.setVisible( false );
|
||||
m_labelTip.setVisible( false );
|
||||
|
||||
ConnectionProgressParams *param = (ConnectionProgressParams *)_initData;
|
||||
ConnectionProgressParams *param = static_cast<ConnectionProgressParams *>(_initData);
|
||||
|
||||
if( param->stringId >= 0 )
|
||||
{
|
||||
@@ -210,7 +210,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
|
||||
// 4J-PB - Removed the option to cancel join - it didn't work anyway
|
||||
// case ACTION_MENU_CANCEL:
|
||||
// {
|
||||
// if(m_cancelFunc != NULL)
|
||||
// if(m_cancelFunc != nullptr)
|
||||
// {
|
||||
// m_cancelFunc(m_cancelFuncParam);
|
||||
// }
|
||||
@@ -245,7 +245,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
|
||||
|
||||
void UIScene_ConnectingProgress::handlePress(F64 controlId, F64 childId)
|
||||
{
|
||||
switch((int)controlId)
|
||||
switch(static_cast<int>(controlId))
|
||||
{
|
||||
case eControl_Confirm:
|
||||
if(m_showingButton)
|
||||
|
||||
Reference in New Issue
Block a user