Merge branch 'smartcmd:main' into main

1 files changed, 4 insertions, 4 deletions

diff --git a/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp b/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
index 02336e00..7f721493 100644
--- a/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
@@ -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;
 }