From 4506a204f946fcac3c9009e0c8f094edc1f42c84 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 23:31:02 +1100 Subject: [PATCH] Remove Win32 preview state types from skin select menu --- .../Platform/Common/UI/UIScene_SkinSelectMenu.cpp | 14 +++++++------- .../Platform/Common/UI/UIScene_SkinSelectMenu.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp index b5b18d24d..71b684362 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp @@ -744,15 +744,15 @@ void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion *region) void UIScene_SkinSelectMenu::handleSkinIndexChanged() { - BOOL showPrevious = FALSE, showNext = FALSE; - DWORD previousIndex = 0, nextIndex = 0; + bool showPrevious = false, showNext = false; + int previousIndex = 0, nextIndex = 0; std::wstring skinName = L""; std::wstring skinOrigin = L""; bool bSkinIsFree=false; bool bLicensed=false; DLCSkinFile *skinFile=NULL; DLCPack *Pack=NULL; - BYTE sidePreviewControlsL,sidePreviewControlsR; + int sidePreviewControlsL, sidePreviewControlsR; m_bNoSkinsToShow=false; TEXTURE_NAME backupTexture = TN_MOB_CHAR; @@ -887,8 +887,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() m_characters[eCharacter_Current].SetTexture(m_selectedSkinPath, backupTexture); m_characters[eCharacter_Current].SetCapeTexture(m_selectedCapePath); - showNext = TRUE; - showPrevious = TRUE; + showNext = true; + showPrevious = true; nextIndex = getNextSkinIndex(m_skinIndex); previousIndex = getPreviousSkinIndex(m_skinIndex); @@ -935,7 +935,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() sidePreviewControlsL=sidePreviewControlsR=sidePreviewControls; } - for(BYTE i = 0; i < sidePreviewControlsR; ++i) + for(int i = 0; i < sidePreviewControlsR; ++i) { if(showNext) { @@ -1006,7 +1006,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() - for(BYTE i = 0; i < sidePreviewControlsL; ++i) + for(int i = 0; i < sidePreviewControlsL; ++i) { if(showPrevious) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h index 3bd9b74b0..04175da6a 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h @@ -11,7 +11,7 @@ private: static const WCHAR *wchDefaultNamesA[eDefaultSkins_Count]; // 4J Stu - How many to show on each side of the main control - static const BYTE sidePreviewControls = 4; + static const int sidePreviewControls = 4; #ifdef __PSVITA__ enum ETouchInput