Merge branch 'smartcmd:main' into main

1 files changed, 22 insertions, 20 deletions

diff --git a/Minecraft.Client/Common/UI/UIControl.cpp b/Minecraft.Client/Common/UI/UIControl.cpp
index be267ada..7582e82f 100644
--- a/Minecraft.Client/Common/UI/UIControl.cpp
+++ b/Minecraft.Client/Common/UI/UIControl.cpp
@@ -6,12 +6,14 @@
 
 UIControl::UIControl()
 {
-	m_parentScene = NULL;
+	m_parentScene = nullptr;
 	m_lastOpacity = 1.0f;
 	m_controlName = "";
 	m_isVisible = true;
 	m_bHidden = false;
 	m_eControlType = eNoControl;
+	m_id = -1;
+	m_pParentPanel = NULL;
 }
 
 bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
@@ -29,15 +31,15 @@ bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string
 	m_nameVisible = registerFastName(L"visible");
 
 	F64 fx, fy, fwidth, fheight;
-	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , NULL , &fx ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , NULL , &fy ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , NULL , &fwidth ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , NULL , &fheight );
+	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , nullptr , &fx ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , nullptr , &fy ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , nullptr , &fwidth ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , nullptr , &fheight );
 
-	m_x = (S32)fx;
-	m_y = (S32)fy;
-	m_width = (S32)Math::round(fwidth);
-	m_height = (S32)Math::round(fheight);
+	m_x = static_cast<S32>(fx);
+	m_y = static_cast<S32>(fy);
+	m_width = static_cast<S32>(Math::round(fwidth));
+	m_height = static_cast<S32>(Math::round(fheight));
 
 	return res;
 }
@@ -45,14 +47,14 @@ bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string
 void UIControl::UpdateControl()
 {
 	F64 fx, fy, fwidth, fheight;
-	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , NULL , &fx ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , NULL , &fy ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , NULL , &fwidth ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , NULL , &fheight );
-	m_x = (S32)fx;
-	m_y = (S32)fy;
-	m_width = (S32)Math::round(fwidth);
-	m_height = (S32)Math::round(fheight);
+	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , nullptr , &fx ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , nullptr , &fy ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , nullptr , &fwidth ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , nullptr , &fheight );
+	m_x = static_cast<S32>(fx);
+	m_y = static_cast<S32>(fy);
+	m_width = static_cast<S32>(Math::round(fwidth));
+	m_height = static_cast<S32>(Math::round(fheight));
 }
 
 void UIControl::ReInit()
@@ -74,7 +76,7 @@ void UIControl::ReInit()
 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, m_parentScene->m_rootPath , m_funcSetAlpha , 2 , value );
 	}
 
-	IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, NULL, m_isVisible );
+	IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, nullptr, m_isVisible );
 }
 
 IggyValuePath *UIControl::getIggyValuePath()
@@ -128,7 +130,7 @@ void UIControl::setVisible(bool visible)
 {
 	if(visible != m_isVisible)
 	{
-		rrbool succ = IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, NULL, visible );
+		rrbool succ = IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, nullptr, visible );
 		if(succ) m_isVisible = visible;
 		else app.DebugPrintf("Failed to set visibility for control\n");
 	}
@@ -138,7 +140,7 @@ bool UIControl::getVisible()
 {
 	rrbool bVisible = false;
 	
-	IggyResult result = IggyValueGetBooleanRS ( getIggyValuePath() , m_nameVisible, NULL, &bVisible );
+	IggyResult result = IggyValueGetBooleanRS ( getIggyValuePath() , m_nameVisible, nullptr, &bVisible );
 	
 	m_isVisible = bVisible;