aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
diff options
context:
space:
mode:
authorqwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com>2026-03-16 21:44:26 -0500
committerGitHub <noreply@github.com>2026-03-16 21:44:26 -0500
commitce739f6045ec72127491286ea3f3f21e537c1b55 (patch)
treef33bd42a47c1b4a7b2153a7fb77127ee3b407db9 /Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp')
-rw-r--r--Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp b/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
index fa29a137..8c275893 100644
--- a/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
@@ -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 , NULL );
+ IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , nullptr );
S32 iRealWidth = m_width;
if(result.type == IGGY_DATATYPE_number)
{
- iRealWidth = (S32)result.number;
+ iRealWidth = static_cast<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 , 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;
} \ No newline at end of file