diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 4dbd93892..2667890be 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -22,6 +22,7 @@ #include "../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h" #include "../Minecraft.World/Blocks/TileEntities/SignTileEntity.h" #include "../Minecraft.World/Blocks/TileEntities/HopperTileEntity.h" +#include "../Minecraft.World/Util/PathHelper.h" #include "../Minecraft.Client/GameState/StatsCounter.h" #include "../Minecraft.Client/GameState/GameMode.h" #include "../Minecraft.Client/Platform/Xbox/Social/SocialManager.h" @@ -4618,7 +4619,7 @@ void CMinecraftApp::loadMediaArchive() { m_mediaArchive = new ArchiveFile(File(mediapath)); #endif } -} + #if 0 std::string path = "Common\\media.arc"; HANDLE hFile = CreateFile( path.c_str(), diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp index 4a3c44c61..a326fb41a 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp @@ -898,7 +898,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); return; bool pccFriendsAllowed = true; bool bContentRestricted = false; - GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(), + ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(), false, &pccAllowed, &pccFriendsAllowed); #if defined(__PS3__) || defined(__PSVITA__) @@ -1343,7 +1343,7 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void* pParam, bool pccAllowed = true; bool pccFriendsAllowed = true; - GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(), + ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(), false, &pccAllowed, &pccFriendsAllowed); if (!pccAllowed && !pccFriendsAllowed) noUGC = true;