diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..3c462f882 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,116 @@ +{ + "search.exclude": { + "**/Minecraft.Client/Common/DummyTexturePack/res": true, + "**/Minecraft.Client/Common/Media": true, + "**/Minecraft.Client/Common/res": true, + "**/Minecraft.Client/Common/Trial": true, + "**/Minecraft.Client/Durango/4JLibs/libs": true, + "**/Minecraft.Client/Durango/CU": true, + "**/Minecraft.Client/Durango/DLCImages": true, + "**/Minecraft.Client/Durango/DurangoExtras/xcompress.dll": true, + "**/Minecraft.Client/Durango/DurangoExtras/xcompress.lib": true, + "**/Minecraft.Client/Durango/Iggy/lib": true, + "**/Minecraft.Client/Durango/Layout": true, + "**/Minecraft.Client/Durango/Miles/lib": true, + "**/Minecraft.Client/Durango/Network/Windows.Xbox.Networking.RealtimeSession.dll": true, + "**/Minecraft.Client/Durango/Network/windows.xbox.networking.realtimesession.pdb": true, + "**/Minecraft.Client/Durango/Network/windows.xbox.networking.realtimesession.winmd": true, + "**/Minecraft.Client/Durango/ServiceConfig": true, + "**/Minecraft.Client/Durango/Sound": true, + "**/Minecraft.Client/Durango/DLCXbox1.cmp": true, + "**/Minecraft.Client/Durango/*.png": true, + "**/Minecraft.Client/DurangoMedia/DLC": true, + "**/Minecraft.Client/DurangoMedia/Layout": true, + "**/Minecraft.Client/DurangoMedia/loc": true, + "**/Minecraft.Client/DurangoMedia/loc/strings.h": false, + "**/Minecraft.Client/DurangoMedia/Media": true, + "**/Minecraft.Client/DurangoMedia/Sound": true, + "**/Minecraft.Client/music": true, + "**/Minecraft.Client/Orbis/4JLibs/Libs": true, + "**/Minecraft.Client/Orbis/DLCImages": true, + "**/Minecraft.Client/Orbis/GameConfig": true, + "**/Minecraft.Client/Orbis/GameConfig/Minecraft.spa.h": false, + "**/Minecraft.Client/Orbis/Iggy/lib": true, + "**/Minecraft.Client/Orbis/Miles/lib": true, + "**/Minecraft.Client/Orbis/min/min.sig": true, + "**/Minecraft.Client/Orbis/min/pronunciation.sig": true, + "**/Minecraft.Client/Orbis/MinecraftPronunciation/MinecraftPronunciation.sig": true, + "**/Minecraft.Client/Orbis/MinecraftPronunciation/pronunciation.sig": true, + "**/Minecraft.Client/Orbis/PS4ProductCodes.bin": true, + "**/Minecraft.Client/Orbis/session_image.jpg": true, + "**/Minecraft.Client/Orbis/session_image.png": true, + "**/Minecraft.Client/OrbisMedia/DLC": true, + "**/Minecraft.Client/OrbisMedia/loc": true, + "**/Minecraft.Client/OrbisMedia/loc/strings.h": false, + "**/Minecraft.Client/OrbisMedia/Media": true, + "**/Minecraft.Client/PS3/4JLibs/libs": true, + "**/Minecraft.Client/PS3/DATA": true, + "**/Minecraft.Client/PS3/Edge": true, + "**/Minecraft.Client/PS3/GameConfig/MinecraftIcon.png": true, + "**/Minecraft.Client/PS3/GameConfig/set.png": true, + "**/Minecraft.Client/PS3/Iggy/lib": true, + "**/Minecraft.Client/PS3/Media": true, + "**/Minecraft.Client/PS3/Media/*.h": true, + "**/Minecraft.Client/PS3/Miles/lib": true, + "**/Minecraft.Client/PS3/Sound": true, + "**/Minecraft.Client/PS3/SPU_Tasks/*.o": true, + "**/Minecraft.Client/PS3/SPU_Tasks/mssspurs.elf": true, + "**/Minecraft.Client/PS3/PS3ProductCodes.bin": true, + "**/Minecraft.Client/PS3_GAME": true, + "**/Minecraft.Client/PS3Media/DLC": true, + "**/Minecraft.Client/PS3Media/loc": true, + "**/Minecraft.Client/PS3Media/Media": true, + "**/Minecraft.Client/PS4_GAME": true, + "**/Minecraft.Client/PSVita/4JLibs/libs": true, + "**/Minecraft.Client/PSVita/app": true, + "**/Minecraft.Client/PSVita/Builds": true, + "**/Minecraft.Client/PSVita/GameConfig": true, + "**/Minecraft.Client/PSVita/GameConfig/Minecraft.spa.h": false, + "**/Minecraft.Client/PSVita/Iggy/lib": true, + "**/Minecraft.Client/PSVita/Miles/lib": true, + "**/Minecraft.Client/PSVita/Sound": true, + "**/Minecraft.Client/PSVita/Tutorial": true, + "**/Minecraft.Client/PSVita/configuration.psp2path": true, + "**/Minecraft.Client/PSVita/PSVitaProductCodes.bin": true, + "**/Minecraft.Client/PSVita/session_image.png": true, + "**/Minecraft.Client/PSVitaMedia/DLC": true, + "**/Minecraft.Client/PSVitaMedia/loc": true, + "**/Minecraft.Client/PSVitaMedia/Media": true, + "**/Minecraft.Client/PSVitaMedia/Tutorial": true, + "**/Minecraft.Client/PSVitaMedia/Minecraft.Client.self": true, + "**/Minecraft.Client/redist64": true + "**/Minecraft.Client/sce_sys": true + "**/Minecraft.Client/TROPDIR": true + "**/Minecraft.Client/Windows64/4JLibs/libs": true, + "**/Minecraft.Client/Windows64/GameConfig/Minecraft.spa": true, + "**/Minecraft.Client/Windows64/GameHDD": true, + "**/Minecraft.Client/Windows64/Iggy/lib": true, + "**/Minecraft.Client/Windows64Media": true, + "**/Minecraft.Client/Windows64Media/4J_strings.h": false, + "**/Minecraft.Client/Windows64Media/strings.h": false, + "**/Minecraft.Client/x64": true, + "**/Minecraft.Client/Xbox/4JLibs/libs": true, + "**/Minecraft.Client/Xbox/4JLibs/Media": true, + "**/Minecraft.Client/Xbox/Cheats": true, + "**/Minecraft.Client/Xbox/ContentPackageBuild": true, + "**/Minecraft.Client/Xbox/Docs": true, + "**/Minecraft.Client/Xbox/GameConfig": true, + "**/Minecraft.Client/Xbox/GameConfig/Minecraft.spa.h": false, + "**/Minecraft.Client/Xbox/kinect": true, + "**/Minecraft.Client/Xbox/loc": true, + "**/Minecraft.Client/Xbox/ReleaseBuild": true, + "**/Minecraft.Client/Xbox/SubmissionBuild": true, + "**/Minecraft.Client/Xbox/Title Update": true, + "**/Minecraft.Client/Xbox/TMSFiles": true, + "**/Minecraft.Client/Xbox/MinecraftWindows.ico": true, + "**/Minecraft.Client/Xbox/small.ico": true, + "**/Minecraft.Client/alphaTest.png": true, + "**/Minecraft.Client/thumbnailTest64.png": true, + "**/Minecraft.Client/thumbnailTest128.png": true, + "**/Minecraft.Client/thumbnailTest256.png": true, + "**/Minecraft.Client/thumbnailTest1028.png": true, + "**/Minecraft.World/x64_Debug": true, + "**/Minecraft.World/x64_Release": true + "**/x64": true + } +} \ No newline at end of file diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index 9109b85f0..12370bb06 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -1867,6 +1867,7 @@ void UIController::unregisterSubstitutionTexture(const wstring &textureName, boo bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUILayer layer, EUIGroup group) { static bool bSeenUpdateTextThisSession = false; + #if 0 // Disable since we don't use this // If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now // display this message the first 3 times if((scene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0)) @@ -1874,6 +1875,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI scene=eUIScene_NewUpdateMessage; bSeenUpdateTextThisSession=true; } + #endif // if you're trying to navigate to the inventory,the crafting, pause or game info or any of the trigger scenes and there's already a menu up (because you were pressing a few buttons at the same time) then ignore the navigate if(GetMenuDisplayed(iPad)) diff --git a/Minecraft.Client/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Common/UI/UIScene_Intro.cpp index 7fc435b22..f4aefc405 100644 --- a/Minecraft.Client/Common/UI/UIScene_Intro.cpp +++ b/Minecraft.Client/Common/UI/UIScene_Intro.cpp @@ -83,17 +83,23 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, bo case C4JStorage::eOptions_Callback_Read: case C4JStorage::eOptions_Callback_Read_FileNotFound: // we've either read it, or it wasn't found + #if 0 if(app.GetGameSettings(0,eGameSetting_PS3_EULA_Read)==0) { ui.NavigateToScene(0,eUIScene_EULA); } else + #endif { ui.NavigateToScene(0,eUIScene_SaveMessage); } break; default: - ui.NavigateToScene(0,eUIScene_EULA); + #if 0 + ui.NavigateToScene(0,eUIScene_EULA); + #else + ui.NavigateToScene(0,eUIScene_SaveMessage); + #endif break; } #elif defined _XBOX_ONE @@ -131,17 +137,23 @@ void UIScene_Intro::handleAnimationEnd() case C4JStorage::eOptions_Callback_Read: case C4JStorage::eOptions_Callback_Read_FileNotFound: // we've either read it, or it wasn't found + #if 0 if(app.GetGameSettings(0,eGameSetting_PS3_EULA_Read)==0) { ui.NavigateToScene(0,eUIScene_EULA); } else + #endif { ui.NavigateToScene(0,eUIScene_SaveMessage); } break; default: - ui.NavigateToScene(0,eUIScene_EULA); + #if 0 + ui.NavigateToScene(0,eUIScene_EULA); + #else + ui.NavigateToScene(0,eUIScene_SaveMessage); + #endif break; }