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:
@@ -83,7 +83,7 @@ void UIControl_TexturePackList::selectSlot(int id)
|
||||
void UIControl_TexturePackList::clearSlots()
|
||||
{
|
||||
IggyDataValue result;
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_clearSlotsFunc ,0 , NULL );
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_clearSlotsFunc ,0 , nullptr );
|
||||
}
|
||||
|
||||
void UIControl_TexturePackList::setEnabled(bool enable)
|
||||
@@ -125,7 +125,7 @@ bool UIControl_TexturePackList::CanTouchTrigger(S32 iX, S32 iY)
|
||||
S32 bCanTouchTrigger = false;
|
||||
if(result.type == IGGY_DATATYPE_boolean)
|
||||
{
|
||||
bCanTouchTrigger = (bool)result.boolval;
|
||||
bCanTouchTrigger = static_cast<bool>(result.boolval);
|
||||
}
|
||||
return bCanTouchTrigger;
|
||||
}
|
||||
@@ -133,12 +133,12 @@ bool UIControl_TexturePackList::CanTouchTrigger(S32 iX, S32 iY)
|
||||
S32 UIControl_TexturePackList::GetRealHeight()
|
||||
{
|
||||
IggyDataValue result;
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
|
||||
|
||||
S32 iRealHeight = m_height;
|
||||
if(result.type == IGGY_DATATYPE_number)
|
||||
{
|
||||
iRealHeight = (S32)result.number;
|
||||
iRealHeight = static_cast<S32>(result.number);
|
||||
}
|
||||
return iRealHeight;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user