backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-24 22:17:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove WinAPI locals from XUI scenes

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-14 07:30:04 +11:00
parent b6d3c0c6ee
commit ce4cb8ea70
5 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp
View file

@ -371,7 +371,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
// Bug 49249 - JPN: Code Defect: Missing Text: String 'Minecraft' is missing in contents download screen. // Bug 49249 - JPN: Code Defect: Missing Text: String 'Minecraft' is missing in contents download screen.
// Looks like we shouldn't be removing this text for Japanese, and probably Chinese & Korean // Looks like we shouldn't be removing this text for Japanese, and probably Chinese & Korean
DWORD dwLanguage = XGetLanguage( ); unsigned int dwLanguage = XGetLanguage();
switch(dwLanguage) switch(dwLanguage)
{ {
case XC_LANGUAGE_KOREAN: case XC_LANGUAGE_KOREAN:
@ -450,7 +450,6 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
if (dlc != NULL) if (dlc != NULL)
{ {
std::uint8_t *pData=NULL; std::uint8_t *pData=NULL;
UINT uiSize=0;
unsigned int dwSize=0; unsigned int dwSize=0;
WCHAR *cString = dlc->wchBanner; WCHAR *cString = dlc->wchBanner;
@ -703,7 +702,6 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha
if (dlc != NULL) if (dlc != NULL)
{ {
std::uint8_t *pImage=NULL; std::uint8_t *pImage=NULL;
UINT uiSize=0;
unsigned int dwSize=0; unsigned int dwSize=0;
WCHAR *cString = dlc->wchBanner; WCHAR *cString = dlc->wchBanner;

4
Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.cpp
View file

@ -326,7 +326,7 @@ HRESULT CScene_HelpAndOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa
case VK_PAD_B: case VK_PAD_B:
case VK_ESCAPE: case VK_ESCAPE:
BYTE userIndex = pInputData->UserIndex; int userIndex = pInputData->UserIndex;
if( !app.IsPauseMenuDisplayed(userIndex) ) if( !app.IsPauseMenuDisplayed(userIndex) )
{ {
// If we are not from a pause menu, then we are from the main menu // If we are not from a pause menu, then we are from the main menu
@ -459,4 +459,4 @@ HRESULT CScene_HelpAndOptions::OnCustomMessage_Splitscreenplayer(bool bJoining,
{ {
bHandled=true; bHandled=true;
return app.AdjustSplitscreenScene_PlayerChanged(m_hObj,&m_OriginalPosition,m_iPad,bJoining,false); return app.AdjustSplitscreenScene_PlayerChanged(m_hObj,&m_OriginalPosition,m_iPad,bJoining,false);
} }

1
Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp
View file

@ -500,7 +500,6 @@ HRESULT CScene_Credits::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
HRESULT CScene_Credits::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled) HRESULT CScene_Credits::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled)
{ {
// ignore any joypads other than the main // ignore any joypads other than the main
BYTE bFocusUser=XuiElementGetFocusUser(pControlNavigateData->hObjSource);
// get the user from the control // get the user from the control
/*if(!=ProfileManager.GetLockedProfile()) /*if(!=ProfileManager.GetLockedProfile())
{ {

2
Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
View file

@ -473,7 +473,7 @@ HRESULT CScene_Leaderboards::OnKeyDown(XUIMessageInput* pInputData, BOOL& bHandl
case VK_PAD_B: case VK_PAD_B:
case VK_ESCAPE: case VK_ESCAPE:
{ {
BYTE userIndex = pInputData->UserIndex; int userIndex = pInputData->UserIndex;
if( !app.IsPauseMenuDisplayed(userIndex) ) if( !app.IsPauseMenuDisplayed(userIndex) )
{ {
// If we are not from a pause menu, then we are from the main menu // If we are not from a pause menu, then we are from the main menu

4
Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.h
View file

@ -155,7 +155,7 @@ private:
std::vector<LevelGenerationOptions *> *m_generators; std::vector<LevelGenerationOptions *> *m_generators;
JoinMenuInitData *m_initData; JoinMenuInitData *m_initData;
UINT m_DefaultMinecraftIconSize; unsigned int m_DefaultMinecraftIconSize;
PBYTE m_DefaultMinecraftIconData; PBYTE m_DefaultMinecraftIconData;
int *m_iConfigA; // track the texture packs that we don't have installed int *m_iConfigA; // track the texture packs that we don't have installed
int m_iTexturePacksNotInstalled; int m_iTexturePacksNotInstalled;
@ -165,4 +165,4 @@ private:
bool m_bTransferComplete; bool m_bTransferComplete;
bool m_bTransferFail; bool m_bTransferFail;
bool m_bSaveTransferInProgress; bool m_bSaveTransferInProgress;
}; };