mirror of
https://github.com/GabsPuNs/Project-Zenith-Main.git
synced 2026-06-28 10:15:55 +00:00
Menu Progress
LaunchMoreOptionsMenu and SettingsGraphicsMenu works now. Change seed dont work. Label update for sliders dont work. InGameHostOptionsMenu is disabled for now.
This commit is contained in:
@@ -81,28 +81,7 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu(int iPad, void *ini
|
||||
m_bUpdateCheats = false;
|
||||
// Update cheat checkboxes
|
||||
UpdateCheats();
|
||||
/*
|
||||
m_checkboxes[eLaunchCheckbox_Online].init(app.GetString(IDS_ONLINE_GAME),eLaunchCheckbox_Online,bOnlineGame);
|
||||
m_checkboxes[eLaunchCheckbox_InviteOnly].init(app.GetString(IDS_INVITE_ONLY),eLaunchCheckbox_InviteOnly,bInviteOnly);
|
||||
m_checkboxes[eLaunchCheckbox_AllowFoF].init(app.GetString(IDS_ALLOWFRIENDSOFFRIENDS),eLaunchCheckbox_AllowFoF,bAllowFriendsOfFriends);
|
||||
m_checkboxes[eLaunchCheckbox_PVP].init(app.GetString(IDS_PLAYER_VS_PLAYER),eLaunchCheckbox_PVP,m_params->bPVP);
|
||||
m_checkboxes[eLaunchCheckbox_TrustSystem].init(app.GetString(IDS_TRUST_PLAYERS),eLaunchCheckbox_TrustSystem,m_params->bTrust);
|
||||
m_checkboxes[eLaunchCheckbox_FireSpreads].init(app.GetString(IDS_FIRE_SPREADS),eLaunchCheckbox_FireSpreads,m_params->bFireSpreads);
|
||||
m_checkboxes[eLaunchCheckbox_TNT].init(app.GetString(IDS_TNT_EXPLODES),eLaunchCheckbox_TNT,m_params->bTNT);
|
||||
m_checkboxes[eLaunchCheckbox_HostPrivileges].init(app.GetString(IDS_HOST_PRIVILEGES),eLaunchCheckbox_HostPrivileges,m_params->bHostPrivileges);
|
||||
m_checkboxes[eLaunchCheckbox_ResetNether].init(app.GetString(IDS_RESET_NETHER),eLaunchCheckbox_ResetNether,m_params->bResetNether);
|
||||
m_checkboxes[eLaunchCheckbox_Structures].init(app.GetString(IDS_GENERATE_STRUCTURES),eLaunchCheckbox_Structures,m_params->bStructures);
|
||||
m_checkboxes[eLaunchCheckbox_FlatWorld].init(app.GetString(IDS_SUPERFLAT_WORLD),eLaunchCheckbox_FlatWorld,m_params->bFlatWorld);
|
||||
m_checkboxes[eLaunchCheckbox_BonusChest].init(app.GetString(IDS_BONUS_CHEST),eLaunchCheckbox_BonusChest,m_params->bBonusChest);
|
||||
|
||||
m_checkboxes[eLaunchCheckbox_KeepInventory].init(app.GetString(IDS_KEEP_INVENTORY), eLaunchCheckbox_KeepInventory, m_params->bKeepInventory);
|
||||
m_checkboxes[eLaunchCheckbox_MobSpawning].init(app.GetString(IDS_MOB_SPAWNING), eLaunchCheckbox_MobSpawning, m_params->bDoMobSpawning);
|
||||
m_checkboxes[eLaunchCheckbox_MobLoot].init(app.GetString(IDS_MOB_LOOT), eLaunchCheckbox_MobLoot, m_params->bDoMobLoot);
|
||||
m_checkboxes[eLaunchCheckbox_MobGriefing].init(app.GetString(IDS_MOB_GRIEFING), eLaunchCheckbox_MobGriefing, m_params->bMobGriefing);
|
||||
m_checkboxes[eLaunchCheckbox_TileDrops].init(app.GetString(IDS_TILE_DROPS), eLaunchCheckbox_TileDrops, m_params->bDoTileDrops);
|
||||
m_checkboxes[eLaunchCheckbox_NaturalRegeneration].init(app.GetString(IDS_NATURAL_REGEN), eLaunchCheckbox_NaturalRegeneration, m_params->bNaturalRegeneration);
|
||||
m_checkboxes[eLaunchCheckbox_DayLightCycle].init(app.GetString(IDS_DAYLIGHT_CYCLE), eLaunchCheckbox_DayLightCycle, m_params->bDoDaylightCycle);
|
||||
*/
|
||||
m_labelGameOptions.init(app.GetString(IDS_GAME_OPTIONS));
|
||||
|
||||
m_worldOptionsList.AddNewLabel(app.GetString(IDS_CREATE_NEW_WORLD_SEED));
|
||||
@@ -119,12 +98,25 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu(int iPad, void *ini
|
||||
m_worldOptionsList.AddNewCheckbox(app.GetString(IDS_SUPERFLAT_WORLD), eLaunchCheckbox_FlatWorld, m_params->bFlatWorld);
|
||||
m_worldOptionsList.AddNewButton(L"Customize Superflat", 22);
|
||||
|
||||
//m_worldOptionsList.AddNewCheckbox(app.GetString(IDS_RESET_NETHER), eLaunchCheckbox_ResetNether, m_params->bResetNether);
|
||||
m_worldOptionsList.AddNewCheckbox(app.GetString(IDS_RESET_NETHER), eLaunchCheckbox_ResetNether, m_params->bResetNether);
|
||||
m_worldOptionsList.AddNewCheckbox(app.GetString(IDS_DISABLE_SAVING), eLaunchCheckbox_DisableSaving, m_params->bDisableSaving);
|
||||
m_worldOptionsList.AddNewCheckbox(app.GetString(IDS_TRUST_PLAYERS), eLaunchCheckbox_TrustSystem, m_params->bTrust);
|
||||
m_worldOptionsList.AddNewCheckbox(app.GetString(IDS_FIRE_SPREADS), eLaunchCheckbox_FireSpreads, m_params->bFireSpreads);
|
||||
m_worldOptionsList.AddNewCheckbox(app.GetString(IDS_TNT_EXPLODES), eLaunchCheckbox_TNT, m_params->bTNT);
|
||||
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_ONLINE_GAME), eLaunchCheckbox_Online, bOnlineGame);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_INVITE_ONLY), eLaunchCheckbox_InviteOnly, bInviteOnly);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_ALLOWFRIENDSOFFRIENDS), eLaunchCheckbox_AllowFoF, bAllowFriendsOfFriends);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_PLAYER_VS_PLAYER), eLaunchCheckbox_PVP, m_params->bPVP);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_HOST_PRIVILEGES), eLaunchCheckbox_HostPrivileges, m_params->bHostPrivileges);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_DAYLIGHT_CYCLE), eLaunchCheckbox_DayLightCycle, m_params->bDoDaylightCycle);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_KEEP_INVENTORY), eLaunchCheckbox_KeepInventory, m_params->bKeepInventory);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_MOB_SPAWNING), eLaunchCheckbox_MobSpawning, m_params->bDoMobSpawning);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_MOB_GRIEFING), eLaunchCheckbox_MobGriefing, m_params->bMobGriefing);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_MOB_LOOT), eLaunchCheckbox_MobLoot, m_params->bDoMobLoot);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_TILE_DROPS), eLaunchCheckbox_TileDrops, m_params->bDoTileDrops);
|
||||
m_gameOptionsList.AddNewCheckbox(app.GetString(IDS_NATURAL_REGEN), eLaunchCheckbox_NaturalRegeneration, m_params->bNaturalRegeneration);
|
||||
|
||||
/*
|
||||
#ifdef _LARGE_WORLDS
|
||||
m_labelWorldSize.init(app.GetString(IDS_WORLD_SIZE));
|
||||
@@ -251,11 +243,8 @@ void UIScene_LaunchMoreOptionsMenu::handleDestroy()
|
||||
void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
|
||||
{
|
||||
if(m_bIgnoreInput) return;
|
||||
#ifdef _WINDOWS64
|
||||
if (isDirectEditBlocking()) return;
|
||||
#endif
|
||||
|
||||
//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
|
||||
ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
|
||||
|
||||
switch(key)
|
||||
@@ -303,78 +292,76 @@ UIControl* UIScene_LaunchMoreOptionsMenu::GetMainPanel()
|
||||
}
|
||||
#endif
|
||||
|
||||
void UIScene_LaunchMoreOptionsMenu::handleCheckboxElementToggled(F64 controlId, F64 idk, bool selected)
|
||||
void UIScene_LaunchMoreOptionsMenu::handleCheckboxElementToggled(F64 controlId, F64 checkboxid, bool checked)
|
||||
{
|
||||
//CD - Added for audio
|
||||
ui.PlayUISFX(eSFX_Press);
|
||||
|
||||
switch(static_cast<EControls>((int)controlId))
|
||||
switch(static_cast<int>(checkboxid))
|
||||
{
|
||||
case eLaunchCheckbox_Online:
|
||||
m_params->bOnlineGame = selected;
|
||||
m_params->bOnlineGame = checked;
|
||||
m_bUpdateOnline = true;
|
||||
break;
|
||||
case eLaunchCheckbox_InviteOnly:
|
||||
m_params->bInviteOnly = selected;
|
||||
m_params->bInviteOnly = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_AllowFoF:
|
||||
m_params->bAllowFriendsOfFriends = selected;
|
||||
m_params->bAllowFriendsOfFriends = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_PVP:
|
||||
m_params->bPVP = selected;
|
||||
m_params->bPVP = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_TrustSystem:
|
||||
m_params->bTrust = selected;
|
||||
m_params->bTrust = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_FireSpreads:
|
||||
m_params->bFireSpreads = selected;
|
||||
m_params->bFireSpreads = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_TNT:
|
||||
m_params->bTNT = selected;
|
||||
m_params->bTNT = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_HostPrivileges:
|
||||
m_params->bHostPrivileges = selected;
|
||||
m_params->bHostPrivileges = checked;
|
||||
m_bUpdateCheats = true;
|
||||
break;
|
||||
case eLaunchCheckbox_ResetNether:
|
||||
m_params->bResetNether = selected;
|
||||
m_params->bResetNether = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_Structures:
|
||||
m_params->bStructures = selected;
|
||||
m_params->bStructures = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_FlatWorld:
|
||||
m_params->bFlatWorld = selected;
|
||||
m_params->bFlatWorld = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_BonusChest:
|
||||
m_params->bBonusChest = selected;
|
||||
m_params->bBonusChest = checked;
|
||||
break;
|
||||
#ifdef _LARGE_WORLDS
|
||||
case eLaunchCheckbox_DisableSaving:
|
||||
m_params->bDisableSaving = selected;
|
||||
m_params->bDisableSaving = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_WorldResizeType:
|
||||
m_params->newWorldSizeOverwriteEdges = selected;
|
||||
m_params->newWorldSizeOverwriteEdges = checked;
|
||||
break;
|
||||
#endif
|
||||
case eLaunchCheckbox_KeepInventory:
|
||||
m_params->bKeepInventory = selected;
|
||||
m_params->bKeepInventory = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_MobSpawning:
|
||||
m_params->bDoMobSpawning = selected;
|
||||
m_params->bDoMobSpawning = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_MobLoot:
|
||||
m_params->bDoMobLoot = selected;
|
||||
m_params->bDoMobLoot = checked;
|
||||
case eLaunchCheckbox_MobGriefing:
|
||||
m_params->bMobGriefing = selected;
|
||||
m_params->bMobGriefing = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_TileDrops:
|
||||
m_params->bDoTileDrops = selected;
|
||||
m_params->bDoTileDrops = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_NaturalRegeneration:
|
||||
m_params->bNaturalRegeneration = selected;
|
||||
m_params->bNaturalRegeneration = checked;
|
||||
break;
|
||||
case eLaunchCheckbox_DayLightCycle:
|
||||
m_params->bDoDaylightCycle = selected;
|
||||
m_params->bDoDaylightCycle = checked;
|
||||
break;
|
||||
};
|
||||
}
|
||||
@@ -382,7 +369,7 @@ void UIScene_LaunchMoreOptionsMenu::handleCheckboxElementToggled(F64 controlId,
|
||||
void UIScene_LaunchMoreOptionsMenu::handleFocusChange(F64 controlId, F64 childId)
|
||||
{
|
||||
int stringId = 0;
|
||||
switch(static_cast<int>(controlId))
|
||||
switch(static_cast<int>(childId))
|
||||
{
|
||||
case eLaunchCheckbox_Online:
|
||||
stringId = IDS_GAMEOPTION_ONLINE;
|
||||
@@ -444,7 +431,6 @@ void UIScene_LaunchMoreOptionsMenu::handleFocusChange(F64 controlId, F64 childId
|
||||
case eControl_EditSeed:
|
||||
stringId = IDS_GAMEOPTION_SEED;
|
||||
break;
|
||||
#ifdef _LARGE_WORLDS
|
||||
case eControl_WorldSize:
|
||||
stringId = IDS_GAMEOPTION_WORLD_SIZE;
|
||||
break;
|
||||
@@ -457,14 +443,13 @@ void UIScene_LaunchMoreOptionsMenu::handleFocusChange(F64 controlId, F64 childId
|
||||
case eLaunchCheckbox_WorldResizeType:
|
||||
stringId = IDS_GAMEOPTION_INCREASE_WORLD_SIZE_OVERWRITE_EDGES;
|
||||
break;
|
||||
#endif
|
||||
};
|
||||
|
||||
UpdateDescriptionText(stringId);
|
||||
}
|
||||
|
||||
/*
|
||||
void UIScene_LaunchMoreOptionsMenu::handleGainFocus(F64 controlId, F64 childId)
|
||||
void UIScene_LaunchMoreOptionsMenu::handleGainFocus(int stringId)
|
||||
{
|
||||
UpdateDescriptionText(stringId);
|
||||
}
|
||||
@@ -535,28 +520,24 @@ void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId)
|
||||
}
|
||||
|
||||
|
||||
void UIScene_LaunchMoreOptionsMenu::handleSliderElementMove(F64 sliderId, F64 currentValue, F64 idk)
|
||||
void UIScene_LaunchMoreOptionsMenu::handleSliderElementMove(F64 controlId, F64 sliderId, F64 currentValue)
|
||||
{
|
||||
int value = static_cast<int>(currentValue);
|
||||
switch(static_cast<int>(sliderId))
|
||||
{
|
||||
case eControl_WorldSize:
|
||||
#ifdef _LARGE_WORLDS
|
||||
m_sliderWorldSize.handleSliderMove(value);
|
||||
m_worldOptionsList.SetSliderValue(sliderId, value, true);
|
||||
m_params->worldSize = value;
|
||||
m_sliderWorldSize.setLabel(app.GetString(m_iWorldSizeTitleA[value]));
|
||||
#endif
|
||||
//m_sliderWorldSize.setLabel(app.GetString(m_iWorldSizeTitleA[value]));
|
||||
break;
|
||||
case eControl_WorldResize:
|
||||
#ifdef _LARGE_WORLDS
|
||||
EGameHostOptionWorldSize changedSize = static_cast<EGameHostOptionWorldSize>(value + 1);
|
||||
if(changedSize >= m_params->currentWorldSize)
|
||||
{
|
||||
m_sliderWorldResize.handleSliderMove(value);
|
||||
m_worldOptionsList.SetSliderValue(sliderId, value, true);
|
||||
m_params->newWorldSize = static_cast<EGameHostOptionWorldSize>(value + 1);
|
||||
m_sliderWorldResize.setLabel(app.GetString(m_iWorldSizeTitleA[value]));
|
||||
//m_sliderWorldResize.setLabel(app.GetString(m_iWorldSizeTitleA[value]));
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user