LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-17 20:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Win32 index types from skin select menu

Browse Source
This commit is contained in:
notmatthewbeshay
2026-03-10 23:26:35 +11:00
parent e20cd0acd0
commit 86c900239b
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp
View File

@@ -442,7 +442,7 @@ void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, bool pr
{
ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex;
int startingIndex = m_packIndex;
m_packIndex = getPreviousPackIndex(m_packIndex);
if(startingIndex != m_packIndex)
{
@@ -477,7 +477,7 @@ void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, bool pr
{
ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex;
int startingIndex = m_packIndex;
m_packIndex = getNextPackIndex(m_packIndex);
if(startingIndex != m_packIndex)
{
@@ -1113,7 +1113,7 @@ TEXTURE_NAME UIScene_SkinSelectMenu::getTextureId(int skinIndex)
return texture;
}
int UIScene_SkinSelectMenu::getNextSkinIndex(DWORD sourceIndex)
int UIScene_SkinSelectMenu::getNextSkinIndex(int sourceIndex)
{
int nextSkin = sourceIndex;
@@ -1147,7 +1147,7 @@ int UIScene_SkinSelectMenu::getNextSkinIndex(DWORD sourceIndex)
return nextSkin;
}
int UIScene_SkinSelectMenu::getPreviousSkinIndex(DWORD sourceIndex)
int UIScene_SkinSelectMenu::getPreviousSkinIndex(int sourceIndex)
{
int previousSkin = sourceIndex;
switch(m_packIndex)
@@ -1200,7 +1200,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
if(m_currentPack != NULL)
{
bool found;
DWORD currentSkinIndex = m_currentPack->getSkinIndexAt(m_currentSkinPath, found);
int currentSkinIndex = m_currentPack->getSkinIndexAt(m_currentSkinPath, found);
if(found) m_skinIndex = currentSkinIndex;
}
else
@@ -1210,8 +1210,8 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
case SKIN_SELECT_PACK_DEFAULT:
if( !GET_IS_DLC_SKIN_FROM_BITMASK(m_originalSkinId) )
{
DWORD ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(m_originalSkinId);
DWORD defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId);
std::uint32_t ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(m_originalSkinId);
std::uint32_t defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId);
if( ugcSkinIndex == 0 )
{
m_skinIndex = (EDefaultSkins) defaultSkinIndex;
@@ -1229,7 +1229,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
DLCPack *Pack=app.m_dlcManager.getPackContainingSkin(chars);
if(Pack)
{
DWORD currentSkinIndex = Pack->getSkinIndexAt(m_currentSkinPath, found);
int currentSkinIndex = Pack->getSkinIndexAt(m_currentSkinPath, found);
if(found) m_skinIndex = app.GetPlayerFavoriteSkinsPos(m_iPad);
}
}
@@ -1304,7 +1304,7 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
}
int UIScene_SkinSelectMenu::getNextPackIndex(DWORD sourceIndex)
int UIScene_SkinSelectMenu::getNextPackIndex(int sourceIndex)
{
int nextPack = sourceIndex;
++nextPack;
@@ -1316,12 +1316,12 @@ int UIScene_SkinSelectMenu::getNextPackIndex(DWORD sourceIndex)
return nextPack;
}
int UIScene_SkinSelectMenu::getPreviousPackIndex(DWORD sourceIndex)
int UIScene_SkinSelectMenu::getPreviousPackIndex(int sourceIndex)
{
int previousPack = sourceIndex;
if (previousPack == SKIN_SELECT_PACK_DEFAULT)
{
DWORD packCount = app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin);
int packCount = app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin);
if (packCount > 0)
{
@@ -1523,7 +1523,7 @@ void UIScene_SkinSelectMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, i
if( m_currentNavigation == eSkinNavigation_Pack )
{
ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex;
int startingIndex = m_packIndex;
m_packIndex = getPreviousPackIndex(m_packIndex);
if(startingIndex != m_packIndex)
{
@@ -1535,7 +1535,7 @@ void UIScene_SkinSelectMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, i
if( m_currentNavigation == eSkinNavigation_Pack )
{
ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex;
int startingIndex = m_packIndex;
m_packIndex = getNextPackIndex(m_packIndex);
if(startingIndex != m_packIndex)
{