backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions 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
Show stats 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.AnimateKeyPress(iPad, key, repeat, pressed, released);
ui.PlayUISFX(eSFX_Scroll); ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex; int startingIndex = m_packIndex;
m_packIndex = getPreviousPackIndex(m_packIndex); m_packIndex = getPreviousPackIndex(m_packIndex);
if(startingIndex != 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.AnimateKeyPress(iPad, key, repeat, pressed, released);
ui.PlayUISFX(eSFX_Scroll); ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex; int startingIndex = m_packIndex;
m_packIndex = getNextPackIndex(m_packIndex); m_packIndex = getNextPackIndex(m_packIndex);
if(startingIndex != m_packIndex) if(startingIndex != m_packIndex)
{ {
@ -1113,7 +1113,7 @@ TEXTURE_NAME UIScene_SkinSelectMenu::getTextureId(int skinIndex)
return texture; return texture;
} }
int UIScene_SkinSelectMenu::getNextSkinIndex(DWORD sourceIndex) int UIScene_SkinSelectMenu::getNextSkinIndex(int sourceIndex)
{ {
int nextSkin = sourceIndex; int nextSkin = sourceIndex;
@ -1147,7 +1147,7 @@ int UIScene_SkinSelectMenu::getNextSkinIndex(DWORD sourceIndex)
return nextSkin; return nextSkin;
} }
int UIScene_SkinSelectMenu::getPreviousSkinIndex(DWORD sourceIndex) int UIScene_SkinSelectMenu::getPreviousSkinIndex(int sourceIndex)
{ {
int previousSkin = sourceIndex; int previousSkin = sourceIndex;
switch(m_packIndex) switch(m_packIndex)
@ -1200,7 +1200,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
if(m_currentPack != NULL) if(m_currentPack != NULL)
{ {
bool found; bool found;
DWORD currentSkinIndex = m_currentPack->getSkinIndexAt(m_currentSkinPath, found); int currentSkinIndex = m_currentPack->getSkinIndexAt(m_currentSkinPath, found);
if(found) m_skinIndex = currentSkinIndex; if(found) m_skinIndex = currentSkinIndex;
} }
else else
@ -1210,8 +1210,8 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
case SKIN_SELECT_PACK_DEFAULT: case SKIN_SELECT_PACK_DEFAULT:
if( !GET_IS_DLC_SKIN_FROM_BITMASK(m_originalSkinId) ) if( !GET_IS_DLC_SKIN_FROM_BITMASK(m_originalSkinId) )
{ {
DWORD ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(m_originalSkinId); std::uint32_t ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(m_originalSkinId);
DWORD defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId); std::uint32_t defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId);
if( ugcSkinIndex == 0 ) if( ugcSkinIndex == 0 )
{ {
m_skinIndex = (EDefaultSkins) defaultSkinIndex; m_skinIndex = (EDefaultSkins) defaultSkinIndex;
@ -1229,7 +1229,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
DLCPack *Pack=app.m_dlcManager.getPackContainingSkin(chars); DLCPack *Pack=app.m_dlcManager.getPackContainingSkin(chars);
if(Pack) if(Pack)
{ {
DWORD currentSkinIndex = Pack->getSkinIndexAt(m_currentSkinPath, found); int currentSkinIndex = Pack->getSkinIndexAt(m_currentSkinPath, found);
if(found) m_skinIndex = app.GetPlayerFavoriteSkinsPos(m_iPad); 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; int nextPack = sourceIndex;
++nextPack; ++nextPack;
@ -1316,12 +1316,12 @@ int UIScene_SkinSelectMenu::getNextPackIndex(DWORD sourceIndex)
return nextPack; return nextPack;
} }
int UIScene_SkinSelectMenu::getPreviousPackIndex(DWORD sourceIndex) int UIScene_SkinSelectMenu::getPreviousPackIndex(int sourceIndex)
{ {
int previousPack = sourceIndex; int previousPack = sourceIndex;
if (previousPack == SKIN_SELECT_PACK_DEFAULT) 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) if (packCount > 0)
{ {
@ -1523,7 +1523,7 @@ void UIScene_SkinSelectMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, i
if( m_currentNavigation == eSkinNavigation_Pack ) if( m_currentNavigation == eSkinNavigation_Pack )
{ {
ui.PlayUISFX(eSFX_Scroll); ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex; int startingIndex = m_packIndex;
m_packIndex = getPreviousPackIndex(m_packIndex); m_packIndex = getPreviousPackIndex(m_packIndex);
if(startingIndex != 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 ) if( m_currentNavigation == eSkinNavigation_Pack )
{ {
ui.PlayUISFX(eSFX_Scroll); ui.PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex; int startingIndex = m_packIndex;
m_packIndex = getNextPackIndex(m_packIndex); m_packIndex = getNextPackIndex(m_packIndex);
if(startingIndex != m_packIndex) if(startingIndex != m_packIndex)
{ {

16
Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h
View file

@ -1,4 +1,6 @@
#pragma once #pragma once
#include <cstdint>
#include "../../Minecraft.World/Util/Definitions.h" #include "../../Minecraft.World/Util/Definitions.h"
#include "UIScene.h" #include "UIScene.h"
#include "UIControl_PlayerSkinPreview.h" #include "UIControl_PlayerSkinPreview.h"
@ -100,8 +102,8 @@ private:
UI_END_MAP_ELEMENTS_AND_NAMES() UI_END_MAP_ELEMENTS_AND_NAMES()
DLCPack *m_currentPack; DLCPack *m_currentPack;
DWORD m_packIndex, m_skinIndex; int m_packIndex, m_skinIndex;
DWORD m_originalSkinId; std::uint32_t m_originalSkinId;
std::wstring m_currentSkinPath, m_selectedSkinPath, m_selectedCapePath; std::wstring m_currentSkinPath, m_selectedSkinPath, m_selectedCapePath;
std::vector<SKIN_BOX *> *m_vAdditionalSkinBoxes; std::vector<SKIN_BOX *> *m_vAdditionalSkinBoxes;
@ -109,7 +111,7 @@ private:
ESkinSelectNavigation m_currentNavigation; ESkinSelectNavigation m_currentNavigation;
bool m_bNoSkinsToShow; bool m_bNoSkinsToShow;
DWORD m_currentPackCount; int m_currentPackCount;
bool m_bIgnoreInput; bool m_bIgnoreInput;
bool m_bSkinIndexChanged; bool m_bSkinIndexChanged;
std::wstring m_leftLabel, m_centreLabel, m_rightLabel; std::wstring m_leftLabel, m_centreLabel, m_rightLabel;
@ -144,15 +146,15 @@ public:
private: private:
void handleSkinIndexChanged(); void handleSkinIndexChanged();
int getNextSkinIndex(DWORD sourceIndex); int getNextSkinIndex(int sourceIndex);
int getPreviousSkinIndex(DWORD sourceIndex); int getPreviousSkinIndex(int sourceIndex);
TEXTURE_NAME getTextureId(int skinIndex); TEXTURE_NAME getTextureId(int skinIndex);
void handlePackIndexChanged(); void handlePackIndexChanged();
void updatePackDisplay(); void updatePackDisplay();
int getNextPackIndex(DWORD sourceIndex); int getNextPackIndex(int sourceIndex);
int getPreviousPackIndex(DWORD sourceIndex); int getPreviousPackIndex(int sourceIndex);
void setCharacterSelected(bool selected); void setCharacterSelected(bool selected);
void setCharacterLocked(bool locked); void setCharacterLocked(bool locked);