mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git
synced 2026-06-18 18:04:01 +00:00
Fixes
Renamed LoadOrJoinMenu to LoadCreateJoinMenu. Fixed a Memory Leak. Fixed GamemodeSlider.
This commit is contained in:
@@ -34,6 +34,13 @@ int UIScene_CreateWorldMenu::m_iDifficultyTitleSettingA[4]=
|
||||
IDS_DIFFICULTY_TITLE_HARD
|
||||
};
|
||||
|
||||
int UIScene_CreateWorldMenu::m_iGamemodeTitleSettingA[3]=
|
||||
{
|
||||
IDS_SURVIVAL,
|
||||
IDS_CREATIVE,
|
||||
IDS_ADVENTURE
|
||||
};
|
||||
|
||||
UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer) : IUIScene_StartGame(iPad, parentLayer)
|
||||
{
|
||||
// Setup all the Iggy references we need for this scene
|
||||
@@ -48,7 +55,6 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
|
||||
|
||||
m_editWorldName.init(m_worldName, eControl_EditWorldName);
|
||||
|
||||
m_buttonGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL),eControl_GameModeToggle);
|
||||
m_buttonMoreOptions.init(app.GetString(IDS_MORE_OPTIONS),eControl_MoreOptions);
|
||||
m_buttonCreateWorld.init(app.GetString(IDS_CREATE_NEW_WORLD),eControl_NewWorld);
|
||||
|
||||
@@ -61,6 +67,9 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
|
||||
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=TRUE;
|
||||
m_MoreOptionsParams.bStructures=TRUE;
|
||||
m_MoreOptionsParams.bFlatWorld=FALSE;
|
||||
@@ -457,25 +466,6 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case eControl_GameModeToggle:
|
||||
switch(m_iGameModeId)
|
||||
{
|
||||
case 0: // Creative
|
||||
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
|
||||
m_iGameModeId = GameType::CREATIVE->getId();
|
||||
m_bGameModeCreative = true;
|
||||
break;
|
||||
case 1: // Adventure
|
||||
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
|
||||
m_iGameModeId = GameType::ADVENTURE->getId();
|
||||
m_bGameModeCreative = false;
|
||||
break;
|
||||
case 2: // Survival
|
||||
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
|
||||
m_iGameModeId = GameType::SURVIVAL->getId();
|
||||
m_bGameModeCreative = false;
|
||||
};
|
||||
break;
|
||||
case eControl_MoreOptions:
|
||||
ui.NavigateToScene(m_iPad, eUIScene_LaunchMoreOptionsMenu, &m_MoreOptionsParams);
|
||||
break;
|
||||
@@ -657,6 +647,29 @@ void UIScene_CreateWorldMenu::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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user