Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -74,12 +74,12 @@ void UIControl_DynamicLabel::TouchScroll(S32 iY, bool bActive)
|
||||
S32 UIControl_DynamicLabel::GetRealWidth()
|
||||
{
|
||||
IggyDataValue result;
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , nullptr );
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , NULL );
|
||||
|
||||
S32 iRealWidth = m_width;
|
||||
if(result.type == IGGY_DATATYPE_number)
|
||||
{
|
||||
iRealWidth = static_cast<S32>(result.number);
|
||||
iRealWidth = (S32)result.number;
|
||||
}
|
||||
return iRealWidth;
|
||||
}
|
||||
@@ -87,12 +87,12 @@ S32 UIControl_DynamicLabel::GetRealWidth()
|
||||
S32 UIControl_DynamicLabel::GetRealHeight()
|
||||
{
|
||||
IggyDataValue result;
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
|
||||
IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
|
||||
|
||||
S32 iRealHeight = m_height;
|
||||
if(result.type == IGGY_DATATYPE_number)
|
||||
{
|
||||
iRealHeight = static_cast<S32>(result.number);
|
||||
iRealHeight = (S32)result.number;
|
||||
}
|
||||
return iRealHeight;
|
||||
}
|
||||
Reference in New Issue
Block a user