backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-23 16:55:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove WinAPI index types from XUI skin select

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-14 07:00:17 +11:00
parent 3e25aa58e5
commit 1e789f55a5
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Minecraft.Client/Platform/Common/XUI/XUI_SkinSelect.cpp
View file

@ -58,7 +58,7 @@ HRESULT CScene_SkinSelect::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
m_packRight.SetEnable(FALSE);
for(BYTE i = 0; i < sidePreviewControls; ++i)
for(int i = 0; i < sidePreviewControls; ++i)
{
//m_previewNextControl->SetAutoRotate(true);
m_previewNextControls[i]->SetFacing(CXuiCtrlMinecraftSkinPreview::e_SkinPreviewFacing_Left);
@ -403,7 +403,7 @@ HRESULT CScene_SkinSelect::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
{
ui.AnimateKeyPress(pInputData->UserIndex, pInputData->dwKeyCode);
CXuiSceneBase::PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex;
int startingIndex = m_packIndex;
m_packIndex = getPreviousPackIndex(m_packIndex);
if(startingIndex != m_packIndex)
{
@ -440,7 +440,7 @@ HRESULT CScene_SkinSelect::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
{
ui.AnimateKeyPress(pInputData->UserIndex, pInputData->dwKeyCode);
CXuiSceneBase::PlayUISFX(eSFX_Scroll);
DWORD startingIndex = m_packIndex;
int startingIndex = m_packIndex;
m_packIndex = getNextPackIndex(m_packIndex);
if(startingIndex != m_packIndex)
{
@ -621,14 +621,14 @@ HRESULT CScene_SkinSelect::OnBasePositionChanged()
void CScene_SkinSelect::handleSkinIndexChanged()
{
BOOL showPrevious = FALSE, showNext = FALSE;
DWORD previousIndex = 0, nextIndex = 0;
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;
bool bNoSkinsToShow=false;
TEXTURE_NAME backupTexture = TN_MOB_CHAR;
@ -778,7 +778,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
wchar_t chars[256];
// turn off all displays
for(BYTE i = 0; i < sidePreviewControls; ++i)
for(int i = 0; i < sidePreviewControls; ++i)
{
m_previewNextControls[i]->SetShow(FALSE);
m_previewPreviousControls[i]->SetShow(FALSE);
@ -816,7 +816,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
sidePreviewControlsL=sidePreviewControlsR=sidePreviewControls;
}
for(BYTE i = 0; i < sidePreviewControlsR; ++i)
for(int i = 0; i < sidePreviewControlsR; ++i)
{
if(showNext)
{
@ -888,7 +888,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
for(BYTE i = 0; i < sidePreviewControlsL; ++i)
for(int i = 0; i < sidePreviewControlsL; ++i)
{
if(showPrevious)
{
@ -1017,11 +1017,11 @@ void CScene_SkinSelect::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);
unsigned int ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(m_originalSkinId);
unsigned int defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId);
if( ugcSkinIndex == 0 )
{
m_skinIndex = (EDefaultSkins) defaultSkinIndex;
m_skinIndex = static_cast<int>(defaultSkinIndex);
}
}
break;
@ -1176,7 +1176,7 @@ TEXTURE_NAME CScene_SkinSelect::getTextureId(int skinIndex)
return texture;
}
int CScene_SkinSelect::getNextSkinIndex(DWORD sourceIndex)
int CScene_SkinSelect::getNextSkinIndex(int sourceIndex)
{
int nextSkin = sourceIndex;
@ -1210,7 +1210,7 @@ int CScene_SkinSelect::getNextSkinIndex(DWORD sourceIndex)
return nextSkin;
}
int CScene_SkinSelect::getPreviousSkinIndex(DWORD sourceIndex)
int CScene_SkinSelect::getPreviousSkinIndex(int sourceIndex)
{
int previousSkin = sourceIndex;
switch(m_packIndex)
@ -1249,7 +1249,7 @@ int CScene_SkinSelect::getPreviousSkinIndex(DWORD sourceIndex)
return previousSkin;
}
int CScene_SkinSelect::getNextPackIndex(DWORD sourceIndex)
int CScene_SkinSelect::getNextPackIndex(int sourceIndex)
{
int nextPack = sourceIndex;
++nextPack;
@ -1261,7 +1261,7 @@ int CScene_SkinSelect::getNextPackIndex(DWORD sourceIndex)
return nextPack;
}
int CScene_SkinSelect::getPreviousPackIndex(DWORD sourceIndex)
int CScene_SkinSelect::getPreviousPackIndex(int sourceIndex)
{
int previousPack = sourceIndex;
if(previousPack == SKIN_SELECT_PACK_DEFAULT)

18
Minecraft.Client/Platform/Common/XUI/XUI_SkinSelect.h
View file

@ -1,5 +1,7 @@
#pragma once
#include <cstdint>
#include "../media/xuiscene_skinselect.h"
#include "XUI_CustomMessages.h"
#include "../../Minecraft.World/Util/Definitions.h"
@ -15,7 +17,7 @@ private:
static WCHAR *wchDefaultNamesA[eDefaultSkins_Count];
// 4J Stu - How many to show on each side of the main control
static const BYTE sidePreviewControls = 4;
static constexpr int sidePreviewControls = 4;
enum ESkinSelectNavigation
{
@ -112,10 +114,10 @@ protected:
std::wstring m_currentSkinPath, m_selectedSkinPath, m_selectedCapePath;
std::vector<SKIN_BOX *> *m_vAdditionalSkinBoxes;
//std::vector<ModelPart *> *m_vAdditionalModelParts;
DWORD m_originalSkinId;
std::uint32_t m_originalSkinId;
DLCPack *m_currentPack;
DWORD m_packIndex, m_skinIndex;
int m_packIndex, m_skinIndex;
public:
// Define the class. The class name must match the ClassOverride property
@ -129,11 +131,11 @@ private:
void updateCurrentFocus();
TEXTURE_NAME getTextureId(int skinIndex);
int getNextSkinIndex(DWORD sourceIndex);
int getPreviousSkinIndex(DWORD sourceIndex);
int getNextSkinIndex(int sourceIndex);
int getPreviousSkinIndex(int sourceIndex);
int getNextPackIndex(DWORD sourceIndex);
int getPreviousPackIndex(DWORD sourceIndex);
int getNextPackIndex(int sourceIndex);
int getPreviousPackIndex(int sourceIndex);
void updateClipping();
@ -143,7 +145,7 @@ private:
bool m_bSlidingSkins, m_bAnimatingMove;
DWORD currentPackCount;
int currentPackCount;
ESkinSelectNavigation m_currentNavigation;
bool m_bIgnoreInput;