LegacyConsole/GabsPuNs-MinecraftConsoles
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-07-04 05:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source 
Renamed LoadOrJoinMenu to LoadCreateJoinMenu.
Fixed a Memory Leak.
Fixed GamemodeSlider.
This commit is contained in:
GabsPuNs
2026-03-29 19:53:49 -04:00
parent 340d1fa0f9
commit 58461bfa3f
28 changed files with 1057 additions and 1046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
View File

@@ -32,6 +32,13 @@ int UIScene_LoadMenu::m_iDifficultyTitleSettingA[4]=
IDS_DIFFICULTY_TITLE_HARD
};
int UIScene_LoadMenu::m_iGamemodeTitleSettingA[3]=
{
IDS_SURVIVAL,
IDS_CREATIVE,
IDS_ADVENTURE
};
int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
{
UIScene_LoadMenu *pClass= static_cast<UIScene_LoadMenu *>(ui.GetSceneFromCallbackId((size_t)lpParam));
@@ -70,7 +77,6 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
m_labelSeed.init(L"");
m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL));
m_buttonGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL),eControl_GameMode);
m_buttonMoreOptions.init(app.GetString(IDS_MORE_OPTIONS),eControl_MoreOptions);
m_buttonLoadWorld.init(app.GetString(IDS_LOAD),eControl_LoadWorld);
m_texturePackList.init(app.GetString(IDS_DLC_MENU_TEXTUREPACKS), eControl_TexturePackList);
@@ -83,6 +89,9 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));
m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_GAMEMODE ),app.GetString(m_iGamemodeTitleSettingA[0]));
m_sliderGamemode.init(TempString,eControl_GameModeToggle,0,2,0);
m_MoreOptionsParams.bGenerateOptions=FALSE;
m_MoreOptionsParams.bPVP = TRUE;
m_MoreOptionsParams.bTrust = TRUE;
@@ -429,7 +438,7 @@ void UIScene_LoadMenu::tick()
if( m_bThumbnailGetFailed )
{
// On Durango, this can happen if a save is still not been synchronised (user cancelled, or some error). Return back to give them a choice to pick another save.
ui.NavigateBack(m_iPad, false, eUIScene_LoadOrJoinMenu);
ui.NavigateBack(m_iPad, false, eUIScene_LoadCreateJoinMenu);
return;
}
@@ -521,26 +530,6 @@ void UIScene_LoadMenu::tick()
m_labelCreatedMode.setLabel( app.GetString(IDS_CREATED_IN_SURVIVAL) );
}
switch(app.GetGameHostOption(uiHostOptions,eGameHostOption_GameType))
{
case 1: // Creative
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
m_bGameModeCreative=true;
m_iGameModeId = GameType::CREATIVE->getId();
break;
case 2: // Adventure
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
m_bGameModeCreative=false;
m_iGameModeId = GameType::ADVENTURE->getId();
break;
case 0: // Survival
default:
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_bGameModeCreative=false;
m_iGameModeId = GameType::SURVIVAL->getId();
break;
};
bool bGameSetting_Online=(app.GetGameSettings(m_iPad,eGameSetting_Online)!=0);
if(app.GetGameHostOption(uiHostOptions,eGameHostOption_FriendsOfFriends) && !(m_bMultiplayerAllowed && bGameSetting_Online))
{
@@ -698,26 +687,6 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId)
switch(static_cast<int>(controlId))
{
case eControl_GameMode:
switch(m_iGameModeId)
{
case 0: // Survival
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
m_iGameModeId = GameType::CREATIVE->getId();
m_bGameModeCreative = true;
break;
case 1: // Creative
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
m_iGameModeId = GameType::ADVENTURE->getId();
m_bGameModeCreative = false;
break;
case 2: // Adventure
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_iGameModeId = GameType::SURVIVAL->getId();
m_bGameModeCreative = false;
break;
};
break;
case eControl_MoreOptions:
ui.NavigateToScene(m_iPad, eUIScene_LaunchMoreOptionsMenu, &m_MoreOptionsParams);
break;
@@ -953,6 +922,29 @@ void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue)
app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value);
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));
m_sliderDifficulty.setLabel(TempString);
break;
case eControl_GameModeToggle:
m_sliderGamemode.handleSliderMove(value);
if (value == 1)
{
m_bGameModeCreative=true;
m_iGameModeId = GameType::CREATIVE->getId();
}
else if (value == 2)
{
m_bGameModeCreative=false;
m_iGameModeId = GameType::ADVENTURE->getId();
}
else
{
m_bGameModeCreative=false;
m_iGameModeId = GameType::SURVIVAL->getId();
}
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_GAMEMODE ),app.GetString(m_iGamemodeTitleSettingA[value]));
m_sliderGamemode.setLabel(TempString);
break;
}
}