diff --git a/Minecraft.Client/Common/Media/XUI/xuiscene_settings_All.h b/Minecraft.Client/Common/Media/XUI/xuiscene_settings_All.h index 35da4409..c172651b 100644 --- a/Minecraft.Client/Common/Media/XUI/xuiscene_settings_All.h +++ b/Minecraft.Client/Common/Media/XUI/xuiscene_settings_All.h @@ -1,7 +1,8 @@ -#define IDC_XuiButtonResetToDefaults L"XuiButtonResetToDefaults" -#define IDC_XuiButtonUI L"XuiButtonUI" -#define IDC_XuiButtonGraphics L"XuiButtonGraphics" -#define IDC_XuiButtonControl L"XuiButtonControl" -#define IDC_XuiButtonAudio L"XuiButtonAudio" -#define IDC_XuiButtonOptions L"XuiButtonOptions" -#define IDC_SceneSettings L"SceneSettings" +#define IDC_XuiSliderMusic L"XuiSliderMusic" +#define IDC_XuiSliderSound L"XuiSliderSound" +#define IDC_XuiSliderGamma L"XuiSliderGamma" +#define IDC_XuiSliderSensitivity L"XuiSliderSensitivity" +#define IDC_XuiSplitScreen L"XuiSplitScreen" +#define IDC_XuiViewBob L"XuiViewBob" +#define IDC_XuiVisibleOnMaps L"XuiShowOnMaps" +#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" \ No newline at end of file diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.h b/Minecraft.Client/Common/XUI/XUI_Chat.h index d685e587..b345e73c 100644 --- a/Minecraft.Client/Common/XUI/XUI_Chat.h +++ b/Minecraft.Client/Common/XUI/XUI_Chat.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_chat.h" +#include "../Media/XUI/xuiscene_chat.h" #include "XUI_CustomMessages.h" #define CHAT_LINES_COUNT 10 diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h index 360ca0b0..7c85aa50 100644 --- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h +++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_connectingprogress.h" +#include "../Media/XUI/xuiscene_connectingprogress.h" class CScene_ConnectingProgress : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h index 412446d0..9825fc3c 100644 --- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h +++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h @@ -1,7 +1,7 @@ #pragma once -#include "../media\xuiscene_DLCOffers.h" -#include "../media\xuiscene_DLCMain.h" +#include "..\Media\XUI\xuiscene_DLCOffers.h" +#include "..\Media\XUI\xuiscene_DLCMain.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Death.h b/Minecraft.Client/Common/XUI/XUI_Death.h index 62d37d0d..90abd243 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.h +++ b/Minecraft.Client/Common/XUI/XUI_Death.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_Death.h" +#include "../Media/XUI/xuiscene_Death.h" #include "XUI_CustomMessages.h" #define BUTTON_DEATH_RESPAWN 0 diff --git a/Minecraft.Client/Common/XUI/XUI_Debug.h b/Minecraft.Client/Common/XUI/XUI_Debug.h index 1fa6d3c8..3dbf824c 100644 --- a/Minecraft.Client/Common/XUI/XUI_Debug.h +++ b/Minecraft.Client/Common/XUI/XUI_Debug.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_debug.h" +#include "../Media/XUI/xuiscene_debug.h" class CScene_Debug : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h index 2e2f5b5a..4c91374e 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "../media/xuiscene_debug_item_editor.h" +#include "../Media/XUI/xuiscene_debug_item_editor.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_Ctrl_4JEdit.h" diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h index ed5f85c2..300f8cf0 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "../media/xuiscene_debugoverlay.h" +#include "../Media/XUI/xuiscene_debugoverlay.h" #define DEBUG_OVERLAY_UPDATE_TIME_PERIOD 10000 diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h index b502d110..daef793e 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_debug_schematic_create.h" +#include "..\Media\XUI\xuiscene_debug_schematic_create.h" #include "XUI_Ctrl_4JEdit.h" #include "..\..\Common\GameRules\ConsoleSchematicFile.h" diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h index 1bc662e9..be0603ea 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_debug_set_camera.h" +#include "..\Media\XUI\xuiscene_debug_set_camera.h" #include "XUI_Ctrl_4JEdit.h" #include "..\..\Common\GameRules\ConsoleSchematicFile.h" diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.h b/Minecraft.Client/Common/XUI/XUI_DebugTips.h index 10627d3c..005f5305 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugTips.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_DebugTips.h" +#include "../Media/XUI/xuiscene_DebugTips.h" diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h index 271a5781..7a8d503f 100644 --- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h +++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_fullscreenprogress.h" +#include "../Media/XUI/xuiscene_fullscreenprogress.h" #include "..\..\..\Minecraft.World\C4JThread.h" #define ERROR_FULLSCREENPROGRESS_ diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.h b/Minecraft.Client/Common/XUI/XUI_HUD.h index f91f03a5..56b24050 100644 --- a/Minecraft.Client/Common/XUI/XUI_HUD.h +++ b/Minecraft.Client/Common/XUI/XUI_HUD.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_hud.h" +#include "../Media/XUI/xuiscene_hud.h" #include "XUI_CustomMessages.h" #define CHAT_LINES_COUNT 10 diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h index 9ece2cd9..c9250af9 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_helpandoptions.h" +#include "../Media/XUI/xuiscene_helpandoptions.h" #include "XUI_CustomMessages.h" #define BUTTON_HAO_CHANGESKIN 0 diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.h b/Minecraft.Client/Common/XUI/XUI_HelpControls.h index 4d14953b..07ee92f0 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpControls.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_controls.h" +#include "../Media/XUI/xuiscene_controls.h" #include "XUI_CustomMessages.h" class CXuiCtrl4JList; diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h index 8a37e925..447add9c 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_howtoplay.h" +#include "../Media/XUI/xuiscene_howtoplay.h" #include "XUI_CustomMessages.h" enum EHowToPlayTextControls diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h index ba334c80..ba6b59b6 100644 --- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_howtoplay_menu.h" +#include "../Media/XUI/xuiscene_howtoplay_menu.h" #include "XUI_CustomMessages.h" class CScene_HowToPlayMenu : public CXuiSceneImpl diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h index cdc99f7c..6a232e9b 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_ingame_host_options.h" +#include "..\Media\XUI\xuiscene_ingame_host_options.h" class CScene_InGameHostOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.h b/Minecraft.Client/Common/XUI/XUI_InGameInfo.h index 8b685aaf..4a5719f6 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.h +++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "../media/xuiscene_ingameinfo.h" +#include "../Media/XUI/xuiscene_ingameinfo.h" #include "XUI_CustomMessages.h" class INetworkPlayer; diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h index 87b9de13..44a44d37 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_ingame_player_options.h" +#include "..\Media\XUI\xuiscene_ingame_player_options.h" class CScene_InGamePlayerOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Intro.h b/Minecraft.Client/Common/XUI/XUI_Intro.h index f896faed..891b74b9 100644 --- a/Minecraft.Client/Common/XUI/XUI_Intro.h +++ b/Minecraft.Client/Common/XUI/XUI_Intro.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_intro.h" +#include "../Media/XUI/xuiscene_intro.h" class CScene_Intro : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h index e06f13e1..0b392d10 100644 --- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h +++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h @@ -1,6 +1,6 @@ #pragma once #include "XUI_Helper.h" -#include "../media/xuiscene_leaderboards.h" +#include "../Media/XUI/xuiscene_leaderboards.h" #include "..\Leaderboards\LeaderboardManager.h" diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.h b/Minecraft.Client/Common/XUI/XUI_LoadSettings.h index 61e934b7..75ef7c61 100644 --- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.h +++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_load_settings.h" +#include "../Media/XUI/xuiscene_load_settings.h" #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.h b/Minecraft.Client/Common/XUI/XUI_MainMenu.h index 2e4279e4..45619151 100644 --- a/Minecraft.Client/Common/XUI/XUI_MainMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_main.h" +#include "../Media/XUI/xuiscene_main.h" #include "XUI_CustomMessages.h" #define BUTTON_PLAYGAME 0 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h index 5b4e6ef7..fc4af20c 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_multi_create.h" +#include "..\Media\XUI\xuiscene_multi_create.h" #include "XUI_Ctrl_4JEdit.h" #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_MultiGameLaunchMoreOptions.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h index 9664640b..605668ab 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h @@ -2,7 +2,7 @@ using namespace std; #include #include -#include "..\Media\xuiscene_multi_gameinfo.h" +#include "..\Media\XUI\xuiscene_multi_gameinfo.h" class FriendSessionInfo; diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h index e91fbac2..12cf7029 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h @@ -1,7 +1,7 @@ #pragma once using namespace std; #include -#include "..\Media\xuiscene_multi_joinload.h" +#include "..\Media\XUI\xuiscene_multi_joinload.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h index 92876240..e33fcb31 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_multi_launch_more_options.h" +#include "..\Media\XUI\xuiscene_multi_launch_more_options.h" class CScene_MultiGameLaunchMoreOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h index 8c4fbb36..7f25d762 100644 --- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h +++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "../media\xuiscene_NewUpdateMessage.h" +#include "..\Media\XUI\xuiscene_NewUpdateMessage.h" class CScene_NewUpdateMessage : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h index b05206c0..5484c8dd 100644 --- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h +++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_partnernetpassword.h" +#include "..\Media\XUI\xuiscene_partnernetpassword.h" #include "XUI_Ctrl_4JEdit.h" #ifdef _CONTENT_PACKAGE diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h index 9c0e0015..ae2466d3 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_Pause.h" +#include "../Media/XUI/xuiscene_Pause.h" #include "..\UI\IUIScene_PauseMenu.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.h b/Minecraft.Client/Common/XUI/XUI_Reinstall.h index 06b823cb..04f14671 100644 --- a/Minecraft.Client/Common/XUI/XUI_Reinstall.h +++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_Reinstall.h" +#include "../Media/XUI/xuiscene_Reinstall.h" #define BUTTON_REINSTALL_THEME 0 #define BUTTON_REINSTALL_GAMERPIC1 1 diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.h b/Minecraft.Client/Common/XUI/XUI_SaveMessage.h index 3e84541c..62d209e2 100644 --- a/Minecraft.Client/Common/XUI/XUI_SaveMessage.h +++ b/Minecraft.Client/Common/XUI/XUI_SaveMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_savemessage.h" +#include "../Media/XUI/xuiscene_savemessage.h" class CScene_SaveMessage : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h index 2b16c8ab..1a793a67 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_anvil.h" +#include "..\Media\XUI\xuiscene_anvil.h" #include "XUI_Scene_AbstractContainer.h" #include "..\UI\IUIScene_AnvilMenu.h" #include "Common\XUI\XUI_Ctrl_4JEdit.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h index 1a5b5d87..b9714d20 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_base.h" +#include "../Media/XUI/xuiscene_base.h" #include "XUI_Ctrl_SlotItem.h" #include "XUI_CustomMessages.h" #include "..\UI\UIEnums.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h index 370b6b18..bd593fd3 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_brewingstand.h" +#include "..\Media\XUI\xuiscene_brewingstand.h" #include "XUI_Scene_AbstractContainer.h" #include "..\UI\IUIScene_BrewingMenu.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h index 475a6974..3651ef8b 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_container.h" +#include "..\Media\XUI\xuiscene_container.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" #include "..\UI\IUIScene_ContainerMenu.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h index 0c6e22ff..05d4989d 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "../media/xuiscene_craftingpanel_2x2.h" +#include "../Media/XUI/xuiscene_craftingpanel_2x2.h" #include "XUI_Ctrl_MinecraftSlot.h" #include "..\..\..\Minecraft.World\Recipy.h" #include "XUI_Ctrl_CraftIngredientSlot.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h index 5cab04a4..bb29804e 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_enchant.h" +#include "..\Media\XUI\xuiscene_enchant.h" #include "..\..\BookModel.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h index 22cbf262..de44e4d8 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_furnace.h" +#include "..\Media\XUI\xuiscene_furnace.h" #include "XUI_Scene_AbstractContainer.h" #include "..\UI\IUIScene_FurnaceMenu.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h index 2a7b305c..877c9268 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_inventory.h" +#include "..\Media\XUI\xuiscene_inventory.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" #include "..\UI\IUIScene_InventoryMenu.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h index bb3ff976..29095650 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_inventory_creative.h" +#include "..\Media\XUI\xuiscene_inventory_creative.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" #include "..\..\..\Minecraft.World\AbstractContainerMenu.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h index 72194cbc..2b867dad 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_trading.h" +#include "..\Media\XUI\xuiscene_trading.h" #include "..\UI\IUIScene_TradingMenu.h" #define TRADING_UPDATE_TIMER_ID (10) diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h index 3008a7ca..8631aec8 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_trap.h" +#include "..\Media\XUI\xuiscene_trap.h" #include "XUI_Scene_AbstractContainer.h" #include "..\UI\IUIScene_DispenserMenu.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h index 7a5e9da0..905a8620 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_Win.h" +#include "../Media/XUI/xuiscene_Win.h" #include "XUI_CustomMessages.h" class CScene_Win : public CXuiSceneImpl diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp index c6dc7118..27ebcd9a 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp @@ -1,51 +1,182 @@ -// Minecraft.cpp : Defines the entry point for the application. -// - #include "stdafx.h" #include "..\XUI\XUI_SettingsAll.h" -//---------------------------------------------------------------------------------- -// Performs initialization tasks - retrieves controls. -//---------------------------------------------------------------------------------- +int CScene_SettingsAll::m_iDifficultySettingA[4]= +{ + IDS_DIFFICULTY_PEACEFUL, + IDS_DIFFICULTY_EASY, + IDS_DIFFICULTY_NORMAL, + IDS_DIFFICULTY_HARD +}; + +int CScene_SettingsAll::m_iDifficultyTitleSettingA[4]= +{ + IDS_DIFFICULTY_TITLE_PEACEFUL, + IDS_DIFFICULTY_TITLE_EASY, + IDS_DIFFICULTY_TITLE_NORMAL, + IDS_DIFFICULTY_TITLE_HARD +}; + HRESULT CScene_SettingsAll::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { - //WCHAR TempString[256]; + WCHAR TempString[256]; m_iPad=*(int *)pInitData->pvInitData; - // if we're not in the game, we need to use basescene 0 bool bNotInGame=(Minecraft::GetInstance()->level==NULL); + bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad; MapChildControls(); + + // Display the tooltips + HRESULT hr = S_OK; + HXUIOBJ hSlider; - XuiControlSetText(m_Buttons[BUTTON_ALL_OPTIONS],app.GetString(IDS_OPTIONS)); - XuiControlSetText(m_Buttons[BUTTON_ALL_AUDIO],app.GetString(IDS_AUDIO)); - XuiControlSetText(m_Buttons[BUTTON_ALL_CONTROL],app.GetString(IDS_CONTROL)); - XuiControlSetText(m_Buttons[BUTTON_ALL_GRAPHICS],app.GetString(IDS_GRAPHICS)); - XuiControlSetText(m_Buttons[BUTTON_ALL_UI],app.GetString(IDS_USER_INTERFACE)); - XuiControlSetText(m_Buttons[BUTTON_ALL_RESETTODEFAULTS],app.GetString(IDS_RESET_TO_DEFAULTS)); + m_SliderA[SLIDER_SETTINGS_MUSIC].SetValue(app.GetGameSettings(m_iPad,eGameSetting_MusicVolume)); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_MUSIC ),app.GetGameSettings(m_iPad,eGameSetting_MusicVolume)); + m_SliderA[SLIDER_SETTINGS_MUSIC].SetText(TempString); - if(ProfileManager.GetPrimaryPad()!=m_iPad) + m_SliderA[SLIDER_SETTINGS_SOUND].SetValue(app.GetGameSettings(m_iPad,eGameSetting_SoundFXVolume)); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SOUND ),app.GetGameSettings(m_iPad,eGameSetting_SoundFXVolume)); + m_SliderA[SLIDER_SETTINGS_SOUND].SetText(TempString); + + m_SliderA[SLIDER_SETTINGS_GAMMA].SetValue(app.GetGameSettings(m_iPad,eGameSetting_Gamma)); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),app.GetGameSettings(m_iPad,eGameSetting_Gamma)); + m_SliderA[SLIDER_SETTINGS_GAMMA].SetText(TempString); + + m_SliderA[SLIDER_SETTINGS_SENSITIVITY].SetValue(app.GetGameSettings(m_iPad,eGameSetting_Sensitivity)); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SENSITIVITY_INGAME ),app.GetGameSettings(m_iPad,eGameSetting_Sensitivity)); //IDS_SLIDER_SENSITIVITY + m_SliderA[SLIDER_SETTINGS_SENSITIVITY].SetText(TempString); + + m_SplitScreen.SetCheck( (app.GetGameSettings(m_iPad,eGameSetting_SplitScreenVertical)!=0)?TRUE:FALSE); + m_SplitScreen.SetText(app.GetString( IDS_CHECKBOX_VERTICAL_SPLIT_SCREEN ) ); + + m_ViewBob.SetCheck( (app.GetGameSettings(m_iPad,eGameSetting_ViewBob)!=0)?TRUE:FALSE); + m_ViewBob.SetText(app.GetString( IDS_VIEW_BOBBING ) ); + + m_VisibleOnMaps.SetCheck( (app.GetGameSettings(m_iPad,eGameSetting_ViewBob)!=0)?TRUE:FALSE); //eGameSetting_VisibleOnMaps + m_VisibleOnMaps.SetText(app.GetString( IDS_OFF ) ); //IDS_VISIBLE_ON_MAPS + + m_SliderA[SLIDER_SETTINGS_DIFFICULTY].SetValue(app.GetGameSettings(m_iPad,eGameSetting_Difficulty)); + swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)])); + m_SliderA[SLIDER_SETTINGS_DIFFICULTY].SetText(TempString); + + wstring wsText=app.GetString(m_iDifficultySettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]); + int size = 14; + if(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) { - D3DXVECTOR3 vec,vecControl; - m_Buttons[BUTTON_ALL_AUDIO].SetShow(FALSE); - m_Buttons[BUTTON_ALL_AUDIO].SetEnable(FALSE); - m_Buttons[BUTTON_ALL_GRAPHICS].SetShow(FALSE); - m_Buttons[BUTTON_ALL_GRAPHICS].SetEnable(FALSE); + size = 12; + } + wchar_t startTags[64]; + swprintf(startTags,64,L"",app.GetHTMLColour(eHTMLColor_White),size); + wsText= startTags + wsText; - float fButtonWidth, fButtonHeight; - m_Buttons[BUTTON_ALL_GRAPHICS].GetPosition(&vecControl); - m_Buttons[BUTTON_ALL_RESETTODEFAULTS].GetBounds(&fButtonWidth, &fButtonHeight); - m_Buttons[BUTTON_ALL_RESETTODEFAULTS].SetPosition(&vecControl); + m_DifficultyText.SetText(wsText.c_str()); - m_Buttons[BUTTON_ALL_CONTROL].GetPosition(&vec); - m_Buttons[BUTTON_ALL_UI].SetPosition(&vec); + bool bRemoveDifficulty=false; + bool bRemoveSettings=false; + float fRemoveHeight=0.0f,fWidth,fHeight; + float fMoveUp=0.0f; - m_Buttons[BUTTON_ALL_AUDIO].GetPosition(&vec); - m_Buttons[BUTTON_ALL_CONTROL].SetPosition(&vec); - - // Resize the whole scene - float fWidth, fHeight; - GetBounds(&fWidth, &fHeight); - SetBounds(fWidth, vecControl.y+fButtonHeight); + if(!bPrimaryPlayer || !bNotInGame) + { + bRemoveDifficulty=true; + + if(!bPrimaryPlayer) + { + bRemoveSettings=true; + } + } + + D3DXVECTOR3 vec1,vec2,vec3; + XuiElementGetPosition(m_SplitScreen,&vec1); + XuiElementGetPosition(m_ViewBob,&vec2); + XuiElementGetPosition(m_VisibleOnMaps,&vec3); + + float fCheckboxHeight=vec1.y-vec2.y-vec3.y; + + if(bRemoveSettings) + { + // MUSIC + m_SliderA[SLIDER_SETTINGS_MUSIC].SetEnable(FALSE); + m_SliderA[SLIDER_SETTINGS_MUSIC].SetShow(FALSE); + hr=XuiElementGetChildById(m_SliderA[SLIDER_SETTINGS_MUSIC].m_hObj,L"XuiSlider",&hSlider); + XuiElementSetShow(hSlider,FALSE); + XuiControlSetEnable(hSlider,FALSE); + XuiControlSetEnable(hSlider,FALSE); + m_SliderA[SLIDER_SETTINGS_MUSIC].GetBounds(&fWidth,&fHeight); + fRemoveHeight+=fHeight+4.0f; // add padding + + // SOUND + m_SliderA[SLIDER_SETTINGS_SOUND].SetEnable(FALSE); + m_SliderA[SLIDER_SETTINGS_SOUND].SetShow(FALSE); + hr=XuiElementGetChildById(m_SliderA[SLIDER_SETTINGS_SOUND].m_hObj,L"XuiSlider",&hSlider); + XuiElementSetShow(hSlider,FALSE); + XuiControlSetEnable(hSlider,FALSE); + m_SliderA[SLIDER_SETTINGS_SOUND].GetBounds(&fWidth,&fHeight); + fRemoveHeight+=fHeight+4.0f; + + // GAMMA + m_SliderA[SLIDER_SETTINGS_GAMMA].SetEnable(FALSE); + m_SliderA[SLIDER_SETTINGS_GAMMA].SetShow(FALSE); + hr=XuiElementGetChildById(m_SliderA[SLIDER_SETTINGS_GAMMA].m_hObj,L"XuiSlider",&hSlider); + XuiElementSetShow(hSlider,FALSE); + XuiControlSetEnable(hSlider,FALSE); + m_SliderA[SLIDER_SETTINGS_GAMMA].GetBounds(&fWidth,&fHeight); + fRemoveHeight+=fHeight+4.0f; + + // SPLITSCREEN + m_SplitScreen.SetShow(FALSE); + m_SplitScreen.SetEnable(FALSE); + m_SplitScreen.GetBounds(&fWidth, &fHeight); + fRemoveHeight+=fCheckboxHeight; + fMoveUp+=fCheckboxHeight; + } + + if(bRemoveDifficulty) + { + m_SliderA[SLIDER_SETTINGS_DIFFICULTY].SetEnable(FALSE); + m_SliderA[SLIDER_SETTINGS_DIFFICULTY].SetShow(FALSE); + m_DifficultyText.SetShow(FALSE); + hr=XuiElementGetChildById(m_SliderA[SLIDER_SETTINGS_DIFFICULTY].m_hObj,L"XuiSlider",&hSlider); + XuiElementSetShow(hSlider,FALSE); + XuiControlSetEnable(hSlider,FALSE); + m_SliderA[SLIDER_SETTINGS_DIFFICULTY].GetBounds(&fWidth,&fHeight); + fRemoveHeight+=fHeight+4.0f; + } + else + { + wstring wsText=app.GetString(m_iDifficultySettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]); + int size = 14; + if(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) + { + size = 12; + } + swprintf(TempString,64,L"",app.GetHTMLColour(eHTMLColor_White),size); + wsText= TempString + wsText; + + m_DifficultyText.SetText(wsText.c_str()); + } + + if(fRemoveHeight>0.0f) + { + D3DXVECTOR3 vec; + + m_SliderA[SLIDER_SETTINGS_SENSITIVITY].GetPosition(&vec); + vec.y-=fMoveUp; + m_SliderA[SLIDER_SETTINGS_SENSITIVITY].SetPosition(&vec); + m_DifficultyText.GetPosition(&vec); + vec.y-=fMoveUp; + m_DifficultyText.SetPosition(&vec); + m_ViewBob.GetPosition(&vec); + vec.y-=fMoveUp; + m_ViewBob.SetPosition(&vec); + m_VisibleOnMaps.GetPosition(&vec); + vec.y-=fMoveUp; + m_VisibleOnMaps.SetPosition(&vec); + + float fbgnWidth, fBgnHeight; + GetBounds(&fbgnWidth, &fBgnHeight); + fBgnHeight-=fRemoveHeight; + SetBounds(fbgnWidth, fBgnHeight); } // if we're not in the game, we need to use basescene 0 @@ -55,33 +186,94 @@ HRESULT CScene_SettingsAll::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) CXuiSceneBase::ShowBackground( DEFAULT_XUI_MENU_USER, TRUE ); } else - { + { ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK); CXuiSceneBase::ShowBackground( m_iPad, FALSE ); } if(app.GetLocalPlayerCount()>1) { - app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad,false); + app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad); CXuiSceneBase::ShowLogo( m_iPad, FALSE ); } else { if(bNotInGame) { - CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, TRUE ); + // can't show the logo for 480 mode + if(!RenderManager.IsHiDef()) + { + CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, FALSE ); + } + else + { + CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, TRUE ); + } } else { - CXuiSceneBase::ShowLogo( m_iPad, TRUE ); + // can't show the logo for 480 mode + if(!RenderManager.IsHiDef()) + { + CXuiSceneBase::ShowLogo( m_iPad, FALSE ); + } + else + { + CXuiSceneBase::ShowLogo( m_iPad, TRUE ); + } } } return S_OK; } - - +HRESULT CScene_SettingsAll::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotifyValueChanged* pNotifyValueChanged, BOOL& bHandled ) +{ + WCHAR TempString[256]; + + if(hObjSource==m_SliderA[SLIDER_SETTINGS_MUSIC].GetSlider() ) + { + app.SetGameSettings(m_iPad,eGameSetting_MusicVolume,pNotifyValueChanged->nValue); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_MUSIC ),pNotifyValueChanged->nValue); + m_SliderA[SLIDER_SETTINGS_MUSIC].SetText(TempString); + } + else if(hObjSource==m_SliderA[SLIDER_SETTINGS_SOUND].GetSlider() ) + { + app.SetGameSettings(m_iPad,eGameSetting_SoundFXVolume,pNotifyValueChanged->nValue); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SOUND ),pNotifyValueChanged->nValue); + m_SliderA[SLIDER_SETTINGS_SOUND].SetText(TempString); + } + if(hObjSource==m_SliderA[SLIDER_SETTINGS_GAMMA].GetSlider() ) + { + app.SetGameSettings(m_iPad,eGameSetting_Gamma,pNotifyValueChanged->nValue); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),pNotifyValueChanged->nValue); + m_SliderA[SLIDER_SETTINGS_GAMMA].SetText(TempString); + } + if(hObjSource==m_SliderA[SLIDER_SETTINGS_SENSITIVITY].GetSlider() ) + { + app.SetGameSettings(m_iPad,eGameSetting_Sensitivity,pNotifyValueChanged->nValue); + swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SENSITIVITY_INGAME ),pNotifyValueChanged->nValue); //IDS_SLIDER_SENSITIVITY + m_SliderA[SLIDER_SETTINGS_SENSITIVITY].SetText(TempString); + } + else if(hObjSource==m_SliderA[SLIDER_SETTINGS_DIFFICULTY].GetSlider() ) + { + app.SetGameSettings(m_iPad,eGameSetting_Difficulty,pNotifyValueChanged->nValue); + swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pNotifyValueChanged->nValue])); + m_SliderA[SLIDER_SETTINGS_DIFFICULTY].SetText(TempString); + + wstring wsText=app.GetString(m_iDifficultySettingA[pNotifyValueChanged->nValue]); + int size = 14; + if(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) + { + size = 12; + } + wchar_t startTags[64]; + swprintf(startTags,64,L"",app.GetHTMLColour(eHTMLColor_White),size); + wsText= startTags + wsText; + m_DifficultyText.SetText(wsText.c_str()); + } + return S_OK; +} HRESULT CScene_SettingsAll::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled) { @@ -94,10 +286,10 @@ HRESULT CScene_SettingsAll::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandl { case VK_PAD_B: case VK_ESCAPE: - // if the profile data has been changed, then force a profile write - // It seems we're allowed to break the 5 minute rule if it's the result of a user action - - app.CheckGameSettingsChanged(true,pInputData->UserIndex); + // check the checkboxes + app.SetGameSettings(m_iPad,eGameSetting_SplitScreenVertical,m_SplitScreen.IsChecked()?1:0); + app.SetGameSettings(m_iPad,eGameSetting_ViewBob,m_ViewBob.IsChecked()?1:0); + app.SetGameSettings(m_iPad,eGameSetting_ViewBob,m_VisibleOnMaps.IsChecked()?1:0); //eGameSetting_VisibleOnMaps app.NavigateBack(pInputData->UserIndex); rfHandled = TRUE; @@ -107,6 +299,17 @@ HRESULT CScene_SettingsAll::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandl return hr; } +//---------------------------------------------------------------------------------- +// Handler for the button press message. +//---------------------------------------------------------------------------------- +HRESULT CScene_SettingsAll::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNotifyPressData, BOOL& rfHandled) +{ + // This assumes all buttons can only be pressed with the A button + ui.AnimateKeyPress(pNotifyPressData->UserIndex, VK_PAD_A); + + return S_OK; +} + HRESULT CScene_SettingsAll::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled) { // added so we can skip greyed out items @@ -122,83 +325,92 @@ HRESULT CScene_SettingsAll::OnControlNavigate(XUIMessageControlNavigate *pContro HRESULT CScene_SettingsAll::OnTransitionStart( XUIMessageTransition *pTransition, BOOL& bHandled ) { - //HRESULT hr; + HRESULT hr; + WCHAR TempString[256]; if(pTransition->dwTransAction==XUI_TRANSITION_ACTION_DESTROY ) return S_OK; if(pTransition->dwTransType == XUI_TRANSITION_TO || pTransition->dwTransType == XUI_TRANSITION_BACKTO) - { - // 4J-PB - Going to resize buttons if the text is too big to fit on any of them (Br-pt problem with the length of Unlock Full Game) - } - - return S_OK; -} - -//---------------------------------------------------------------------------------- -// Handler for the button press message. -//---------------------------------------------------------------------------------- -HRESULT CScene_SettingsAll::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNotifyPressData, BOOL& rfHandled) -{ - // This assumes all buttons can only be pressed with the A button - ui.AnimateKeyPress(pNotifyPressData->UserIndex, VK_PAD_A); - - unsigned int uiButtonCounter=0; - - while((uiButtonCounterUserIndex,eUIScene_SettingsOptionsMenu); - break; - case BUTTON_ALL_AUDIO: - app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_SettingsAudioMenu); - break; - case BUTTON_ALL_CONTROL: - app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_SettingsControlMenu); - break; - case BUTTON_ALL_GRAPHICS: - app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_SettingsGraphicsMenu); - break; - case BUTTON_ALL_UI: - app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_SettingsUIMenu); - break; - case BUTTON_ALL_RESETTODEFAULTS: + float fMaxTextLen=0.0f; + float fMaxLen=0.0f; + + HXUIOBJ hSlider,hVisual,hText,hCheckboxText; + XUIRect xuiRect; + float fWidth,fHeight; + D3DXVECTOR3 vec,vSlider,vecCheckboxText,vecCheckbox; + + // don't display values on these - we handle that + for(int i=0;iUserIndex,&CScene_SettingsAll::ResetDefaultsDialogReturned,this, app.GetStringTable()); - } - break; - - } - - rfHandled=TRUE; - return S_OK; -} - -HRESULT CScene_SettingsAll::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled) -{ - bool bNotInGame=(Minecraft::GetInstance()->level==NULL); - - // if we're not in the game, we need to use basescene 0 - if(bNotInGame) - { - ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK); - CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, TRUE ); - } - else - { - ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK); - if(!RenderManager.IsHiDef() || app.GetLocalPlayerCount()>1) - { - CXuiSceneBase::ShowLogo( m_iPad, FALSE ); + m_SliderA[i].SetValueDisplay(FALSE); } - else + + hr=XuiElementGetChildById(m_SliderA[SLIDER_SETTINGS_MUSIC].m_hObj,L"XuiSlider",&hSlider); + hr=XuiControlGetVisual(hSlider,&hVisual); + hr=XuiElementGetChildById(hVisual,L"text_Label",&hText); + hr=XuiElementGetPosition(m_SliderA[SLIDER_SETTINGS_MUSIC].m_hObj,&vSlider); + + for(int i=0;ifMaxTextLen) fMaxTextLen=xuiRect.right; + if(fWidth>fMaxLen) fMaxLen=fWidth; + } + + if(fMaxLen1) + { + // scene width needs to be more that the text width on buttons + fWidth=vSlider.x; + vec.x=floorf((640.0f-(fMaxTextLen+fWidth))/2.0f); + XuiElementSetPosition(m_hObj,&vec); + XuiElementSetBounds(m_hObj,fMaxTextLen+(fWidth*2.0f),fHeight); + } + else + { + fWidth=vSlider.x; + vec.x=floorf((1280.0f-(fMaxTextLen+fWidth))/2.0f); + XuiElementSetPosition(m_hObj,&vec); + XuiElementSetBounds(m_hObj,fMaxTextLen+(fWidth*2.0f),fHeight); + } + // Need to refresh the scenes visual since the object size has now changed + XuiControlAttachVisual(m_hObj); + + // centre is vec.x+(fWidth/2) + for(int i=0;i -#include "..\Media\xuiscene_TransferToXboxOne.h" +#include "..\Media\XUI\xuiscene_TransferToXboxOne.h" class CXuiCtrl4JList; diff --git a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h index 748b36a2..bc4b1dd9 100644 --- a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h +++ b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_trialexitupsell.h" +#include "../Media/XUI/xuiscene_trialexitupsell.h" #define TRIAL_EXIT_UPSELL_IMAGE_DISPLAY_TIME 3000 diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h index 65716759..ca475a84 100644 --- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h +++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_tutorialpopup.h" +#include "../Media/XUI/xuiscene_tutorialpopup.h" #include "XUI_CustomMessages.h" class Tutorial;