aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp')
-rw-r--r--Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp b/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
index 8b7eb9a1..b6bd3e47 100644
--- a/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
@@ -23,7 +23,7 @@ bool UIControl_HTMLLabel::setupControl(UIScene *scene, IggyValuePath *parent, co
void UIControl_HTMLLabel::startAutoScroll()
{
IggyDataValue result;
- IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcStartAutoScroll , 0 , NULL );
+ IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcStartAutoScroll , 0 , nullptr );
}
void UIControl_HTMLLabel::ReInit()
@@ -79,12 +79,12 @@ void UIControl_HTMLLabel::TouchScroll(S32 iY, bool bActive)
S32 UIControl_HTMLLabel::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;
}
@@ -92,12 +92,12 @@ S32 UIControl_HTMLLabel::GetRealWidth()
S32 UIControl_HTMLLabel::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