Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp b/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
index 68a3d655..4f0e5ca0 100644
--- a/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
@@ -60,7 +60,7 @@ void UIControl_ButtonList::ReInit()
 void UIControl_ButtonList::clearList()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_removeAllItemsFunc , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_removeAllItemsFunc , 0 , nullptr );
 
 	m_itemCount = 0;
 }
@@ -82,7 +82,7 @@ void UIControl_ButtonList::addItem(const string &label, int data)
 
 	IggyStringUTF8 stringVal;
 	stringVal.string = (char*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF8;
 	value[0].string8 = stringVal;
 
@@ -159,7 +159,7 @@ void UIControl_ButtonList::setButtonLabel(int iButtonId, const wstring &label)
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcSetButtonLabel, 2 , value );
 }
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 void UIControl_ButtonList::SetTouchFocus(S32 iX, S32 iY, bool bRepeat)
 {
 	IggyDataValue result;