diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 86d848e50..d6828122a 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -88,7 +88,7 @@ int Minecraft::frameTimePos = 0; int64_t Minecraft::warezTime = 0; File Minecraft::workDir = File(L""); -#ifdef __PSVITA__ +#if 0 TOUCHSCREENRECT QuickSelectRect[3] = { {560, 890, 1360, 980}, @@ -220,7 +220,7 @@ Minecraft::Minecraft(Component* mouseComponent, Canvas* parent, // 4J-PB - Removed it from here on Orbis due to it causing a crash with the // network init. We should work out why... -#ifndef __ORBIS__ +#if 1 this->soundEngine->init(NULL); #endif @@ -433,7 +433,7 @@ void Minecraft::init() { void Minecraft::renderLoadingScreen() { // 4J Unused // testing stuff on vita just now -#if (defined(__PSVITA__) || defined(ENABLE_JAVA_GUIS)) +#if (0 || defined(ENABLE_JAVA_GUIS)) ScreenSizeCalculator ssc(options, width, height); // xxx @@ -1011,7 +1011,7 @@ bool Minecraft::addLocalPlayer(int idx) { } else { app.DebugPrintf("g_NetworkManager.AddLocalPlayerByUserIndex failed\n"); -#ifdef _DURANGO +#if 0 ProfileManager.RemoveGamepadFromGame(idx); #endif } @@ -1151,7 +1151,7 @@ void Minecraft::removeLocalPlayerIdx(int idx) { } getLevel(localplayers[idx]->dimension)->removeEntity(localplayers[idx]); -#ifdef _XBOX +#if 0 // 4J Stu - Fix for #12368 - Crash: Game crashes when saving then // exiting and selecting to save app.TutorialSceneNavigateBack(idx); @@ -1176,14 +1176,14 @@ void Minecraft::removeLocalPlayerIdx(int idx) { // Not sure how this works on qnet, but for other platforms, calling // RemoveLocalPlayerByUserIndex won't do anything if there isn't a local // user to remove Now just updating the UI directly in this case -#ifdef _XBOX +#if 0 // 4J Stu - A signout early in the game creation before this player has // connected to the game server updateXui = false; #endif // 4J Stu - Adding this back in for exactly the reason my comment above // suggests it was added in the first place -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 g_NetworkManager.RemoveLocalPlayerByUserIndex(idx); #endif } @@ -1458,7 +1458,7 @@ void Minecraft::run_middle() { pauseGame(); #endif } -#ifdef _DURANGO +#if 0 if (InputManager.ButtonPressed(i, ACTION_MENU_GTC_PAUSE)) localplayers[i]->ullButtonsPressed |= 1LL << ACTION_MENU_GTC_PAUSE; @@ -1522,7 +1522,7 @@ void Minecraft::run_middle() { localplayers[i]->ullDpad_this = 0; int dirCount = 0; -#ifndef __PSVITA__ +#if 1 if (InputManager.ButtonDown( i, MINECRAFT_ACTION_DPAD_LEFT)) { localplayers[i]->ullDpad_this |= @@ -1573,7 +1573,7 @@ void Minecraft::run_middle() { } else { // 4J Stu - This doesn't make any sense with the way we // handle XboxOne users -#ifndef _DURANGO +#if 1 // did we just get input from a player who doesn't exist? // They'll be wanting to join the game then bool tryJoin = !pause && @@ -1694,11 +1694,11 @@ void Minecraft::run_middle() { } } } -#endif // _DURANGO +#endif // 0 } } -#ifdef _DURANGO +#if 0 // did we just get input from a player who doesn't exist? They'll be // wanting to join the game then if (!pause && @@ -3628,7 +3628,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { #ifdef _DEBUG_MENUS_ENABLED if (app.DebugSettingsOn()) { -#ifndef __PSVITA__ +#if 1 // 4J-PB - debugoverlay for primary player only if (iPad == ProfileManager.GetPrimaryPad()) { if ((player->ullButtonsPressed & @@ -3636,7 +3636,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { #ifndef _CONTENT_PACKAGE options->renderDebug = !options->renderDebug; -#ifdef _XBOX +#if 0 app.EnableDebugOverlay(options->renderDebug, iPad); #else // 4J Stu - The xbox uses a completely different way of @@ -3738,7 +3738,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } if ((player->ullButtonsPressed & (1LL << MINECRAFT_ACTION_PAUSEMENU)) -#ifdef _DURANGO +#if 0 || (player->ullButtonsPressed & (1LL << ACTION_MENU_GTC_PAUSE)) #endif ) { @@ -3759,7 +3759,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { uint64_t ullButtonsPressed = player->ullButtonsPressed; bool selected = false; -#ifdef __PSVITA__ +#if 0 // 4J-PB - use the touchscreen for quickselect SceTouchData* pTouchData = InputManager.GetTouchPadData(iPad, false); @@ -4059,7 +4059,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // optimisation to set the culling off early, in parallel with // other stuff -#if defined __PS3__ && !defined DISABLE_SPU_CODE +#if 0 && !defined DISABLE_SPU_CODE // kick off the culling for all valid players in this level int currPlayerIdx = getLocalPlayerIdx(); for (int idx = 0; idx < XUSER_MAX_COUNT; idx++) { @@ -4093,7 +4093,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } setLocalPlayerIdx(currPlayerIdx); -#endif // __PS3__ +#endif // 0 // 4J Stu - We are always online, but still could be paused if (!pause) // || isClientSide()) @@ -4123,7 +4123,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (pause) tickAllConnections(); // player->tick(); } -#ifdef __PS3__ +#if 0 // while(!g_tickLevelQueue.empty()) // { @@ -4331,7 +4331,7 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, PlayerUID playerXUIDOnline = INVALID_XUID; ProfileManager.GetXUID(iPrimaryPlayer, &playerXUIDOffline, false); ProfileManager.GetXUID(iPrimaryPlayer, &playerXUIDOnline, true); -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode() && playerXUIDOnline.getOnlineID()[0] == 0) { // player doesn't have an online UID, set it from the player @@ -4773,7 +4773,7 @@ void Minecraft::main() { // On PS4, we call Minecraft::Start from another thread, as this has been // timed taking ~2.5 seconds and we need to do some basic rendering stuff so // that we don't break the TRCs on SubmitDone calls -#ifndef __ORBIS__ +#if 1 Minecraft::start(name, sessionId); #endif } @@ -4994,7 +4994,7 @@ void Minecraft::playerLeftTutorial(int iPad) { // 4J Stu -This telemetry event means something different on XboxOne, so // we don't call it for simple state changes like this -#ifndef _XBOX_ONE +#if 1 for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { if (localplayers[idx] != NULL) { TelemetryManager->RecordLevelStart( @@ -5008,7 +5008,7 @@ void Minecraft::playerLeftTutorial(int iPad) { } } -#ifdef _DURANGO +#if 0 void Minecraft::inGameSignInCheckAllPrivilegesCallback(void* lpParam, bool hasPrivileges, int iPad) { @@ -5048,7 +5048,7 @@ void Minecraft::inGameSignInCheckAllPrivilegesCallback(void* lpParam, } #endif -#ifdef _XBOX_ONE +#if 0 int Minecraft::InGame_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) #else @@ -5074,7 +5074,7 @@ int Minecraft::InGame_SignInReturned(void* pParam, bool bContinue, int iPad) // It's possible that the player has not signed in - they can back out // or choose no for the converttoguest if (ProfileManager.IsSignedIn(iPad)) { -#ifdef _DURANGO +#if 0 if (!g_NetworkManager.IsLocalGame() && ProfileManager.IsSignedInLive(iPad) && ProfileManager.AllowedToPlayMultiplayer(iPad)) { @@ -5088,7 +5088,7 @@ int Minecraft::InGame_SignInReturned(void* pParam, bool bContinue, int iPad) uiIDA[0] = IDS_OK; ui.RequestErrorMessage(IDS_MULTIPLAYER_FULL_TITLE, IDS_MULTIPLAYER_FULL_TEXT, uiIDA, 1); -#ifdef _DURANGO +#if 0 ProfileManager.RemoveGamepadFromGame(iPad); #endif } @@ -5126,7 +5126,7 @@ int Minecraft::InGame_SignInReturned(void* pParam, bool bContinue, int iPad) ui.RequestErrorMessage(IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA, 1, iPad); -#ifdef _DURANGO +#if 0 ProfileManager.RemoveGamepadFromGame(iPad); #endif } @@ -5182,7 +5182,7 @@ ColourTable* Minecraft::getColourTable() { return colours; } -#if defined __ORBIS__ +#if 0 int Minecraft::MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result) { Minecraft* pMinecraft = (Minecraft*)pParam; diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index b6f9747cc..00927b354 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -260,7 +260,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData* initData, mcprogress->progressStart(IDS_PROGRESS_INITIALISING_SERVER); if (findSeed) { -#ifdef __PSVITA__ +#if 0 seed = BiomeSource::findSeed(pLevelType, &running); #else seed = BiomeSource::findSeed(pLevelType); @@ -337,7 +337,7 @@ int MinecraftServer::runPostUpdate(void* lpParam) { Sleep(1); } while (!server->m_postUpdateTerminate && ShutdownManager::ShouldRun(ShutdownManager::ePostProcessThread)); - // #ifndef __PS3__ + // #ifndef 0 // One final pass through updates to make sure we're done EnterCriticalSection(&server->m_postProcessCS); int maxRequests = server->m_postProcessRequests.size(); @@ -349,7 +349,7 @@ int MinecraftServer::runPostUpdate(void* lpParam) { LeaveCriticalSection(&server->m_postProcessCS); request.chunkSource->postProcess(request.chunkSource, request.x, request.z); -#ifdef __PS3__ +#if 0 #ifndef _CONTENT_PACKAGE if ((server->m_postProcessRequests.size() % 10) == 0) printf("processing request %00d\n", @@ -360,7 +360,7 @@ int MinecraftServer::runPostUpdate(void* lpParam) { EnterCriticalSection(&server->m_postProcessCS); } LeaveCriticalSection(&server->m_postProcessCS); - // #endif //__PS3__ + // #endif //0 Tile::ReleaseThreadStorage(); AABB::ReleaseThreadStorage(); Vec3::ReleaseThreadStorage(); @@ -586,7 +586,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, int64_t startTime = System::currentTimeMillis(); // 4J Stu - Added this to temporarily make starting games on vita faster -#ifdef __PSVITA__ +#if 0 int r = 48; #else int r = 196; @@ -900,7 +900,7 @@ void MinecraftServer::saveAllChunks() { for (unsigned int i = 0; i < levels.length; i++) { // 4J Stu - Due to the way save mounting is handled on XboxOne, we can // actually save after the player has signed out. -#ifndef _XBOX_ONE +#if 1 if (m_bPrimaryPlayerSignedOut) break; #endif // 4J Stu - Save the levels in reverse order so we don't overwrite the @@ -1005,7 +1005,7 @@ bool MinecraftServer::IsSuspending() { return m_suspending; } void MinecraftServer::stopServer(bool didInit) { // 4J-PB - need to halt the rendering of the data, since we're about to // remove it -#ifdef __PS3__ +#if 0 if (ShutdownManager::ShouldRun( ShutdownManager::eServerThread)) // This thread will take itself // out if we are shutting down @@ -1023,7 +1023,7 @@ void MinecraftServer::stopServer(bool didInit) { // also need to check for a profile switch here - primary player signs out, // and another player signs in before dismissing the dash -#ifdef _DURANGO +#if 0 // On Durango check if the primary user is signed in OR mid-sign-out if (ProfileManager.GetUser(0, true) != nullptr) #else @@ -1031,7 +1031,7 @@ void MinecraftServer::stopServer(bool didInit) { ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad())) #endif { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 // Always save on exit! Except if saves are disabled. if (!saveOnExitAnswered()) m_saveOnExit = true; #endif @@ -1076,7 +1076,7 @@ void MinecraftServer::stopServer(bool didInit) { // ultimately delete the directory level storage & therefore the // ConsoleSaveSplit instance, which needs to be around until all the sub // files have completed saving. -#if defined(_DURANGO) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 while (StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle) { Sleep(10); } @@ -1091,7 +1091,7 @@ void MinecraftServer::stopServer(bool didInit) { } } -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 // Clear the update flags as it's possible they could be out of sync, // causing a crash when starting a new world after the first new level ticks // Fix for PS3 #1538 - [IN GAME] If the user 'Exit without saving' from @@ -1332,7 +1332,7 @@ void MinecraftServer::run(int64_t seed, void* lpParameter) { switch (eAction) { case eXuiServerAction_AutoSaveGame: -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 { PIXBeginNamedEvent(0, "Autosave"); @@ -1685,7 +1685,7 @@ void MinecraftServer::tick() { GameRules::RULE_DAYLIGHT))), level->dimension->id); } - // #ifndef __PS3__ + // #ifndef 0 static int64_t stc = 0; int64_t st0 = System::currentTimeMillis(); PIXBeginNamedEvent(0, "Level tick %d", i); @@ -1708,7 +1708,7 @@ void MinecraftServer::tick() { // nether, but Actually gets removed only when it returns if ((players->getPlayerCount(level) > 0) || (level->hasEntitiesToRemove())) { -#ifdef __PSVITA__ +#if 0 // AP - the PlayerList->viewDistance initially starts out at 3 // to make starting a level speedy the problem with this is that // spawned monsters are always generated on the edge of the @@ -1736,7 +1736,7 @@ void MinecraftServer::tick() { // printf(">>>>>>>>>>>>>>>>>>>>>> Tick %d %d %d : //%d\n", st1 - st0, st2 - st1, st3 - st2, st0 - stc ); stc = st0; - // #endif// __PS3__ + // #endif// 0 } } Entity::tickExtraWandering(); // 4J added @@ -1835,7 +1835,7 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer* player) { } } -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 return (player->GetOutstandingAckCount() < 3); #else return (player->GetOutstandingAckCount() < 2); diff --git a/Minecraft.Client/Platform/Common/App_Defines.h b/Minecraft.Client/Platform/Common/App_Defines.h index b3453e53e..10cb99994 100644 --- a/Minecraft.Client/Platform/Common/App_Defines.h +++ b/Minecraft.Client/Platform/Common/App_Defines.h @@ -9,7 +9,7 @@ #define MAX_TYPE_SIZE 32 #define MAX_EXTENSION_TYPES 3 -#ifdef __PSVITA__ +#if 0 #define MAX_LOCAL_PLAYERS 1 #else #define MAX_LOCAL_PLAYERS 4 @@ -59,7 +59,7 @@ enum EGameHostOptionWorldSize { e_worldSize_Large }; -#ifdef _XBOX +#if 0 #define PROFILE_VERSION_1 1 #define PROFILE_VERSION_2 2 #define PROFILE_VERSION_3 3 diff --git a/Minecraft.Client/Platform/Common/App_enums.h b/Minecraft.Client/Platform/Common/App_enums.h index 8e33689db..e2ee02a32 100644 --- a/Minecraft.Client/Platform/Common/App_enums.h +++ b/Minecraft.Client/Platform/Common/App_enums.h @@ -72,7 +72,7 @@ enum eXuiAction { eAppAction_TexturePackRequired, // when the user has joined from invite, // but doesn't have the texture pack -#ifdef __ORBIS__ +#if 0 eAppAction_OptionsSaveNoSpace, #endif eAppAction_DebugText, @@ -630,7 +630,7 @@ enum eGameHostOption { // 4J-PB - If any new DLC items are added to the TMSFiles, this array needs // updated -#ifdef _XBOX +#if 0 enum _TMSFILES { TMS_SP1 = 0, TMS_SP2, @@ -808,12 +808,12 @@ enum EControllerActions { ACTION_MENU_OTHER_STICK_RIGHT, ACTION_MENU_PAUSEMENU, -#ifdef _DURANGO +#if 0 ACTION_MENU_GTC_PAUSE, ACTION_MENU_GTC_RESUME, #endif -#ifdef __ORBIS__ +#if 0 ACTION_MENU_TOUCHPAD_PRESS, #endif diff --git a/Minecraft.Client/Platform/Common/App_structs.h b/Minecraft.Client/Platform/Common/App_structs.h index dbd1c56bb..0a56bdd33 100644 --- a/Minecraft.Client/Platform/Common/App_structs.h +++ b/Minecraft.Client/Platform/Common/App_structs.h @@ -117,7 +117,7 @@ typedef struct { }; } GAME_SETTINGS; -#ifdef _XBOX_ONE +#if 0 typedef struct { WCHAR wchPlayerUID[64]; char pszLevelName[14]; @@ -150,11 +150,11 @@ typedef struct { typedef struct { eDLCContentType eDLCType; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 char chImageURL[256]; // SCE_NP_COMMERCE2_URL_LEN #else -#ifdef _XBOX_ONE +#if 0 std::wstring wsProductId; std::wstring wsDisplayName; @@ -196,7 +196,7 @@ typedef struct _TMSPPRequest { C4JStorage::eGlobalStorage eStorageFacility; C4JStorage::eTMS_FILETYPEVAL eFileTypeVal; // char szFilename[MAX_TMSFILENAME_SIZE]; -#ifdef _XBOX_ONE +#if 0 int (*CallbackFunc)(void*, int, int, void*, WCHAR*); #else int (*CallbackFunc)(void*, int, int, C4JStorage::PTMSPP_FILEDATA, diff --git a/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp index d9b52d283..c34b51ea4 100644 --- a/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp @@ -10,7 +10,7 @@ #include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #include "../DLC/DLCAudioFile.h" -#ifdef __PSVITA__ +#if 0 #include #endif #ifdef __linux__ @@ -91,11 +91,11 @@ char SoundEngine::m_szRedistName[] = {"redist64"}; char SoundEngine::m_szSoundPath[] = {"Durango\\Sound\\"}; char SoundEngine::m_szMusicPath[] = {"music\\"}; char SoundEngine::m_szRedistName[] = {"redist64"}; -#elif defined _DURANGO +#elif 0 char SoundEngine::m_szSoundPath[] = {"Sound\\"}; char SoundEngine::m_szMusicPath[] = {"music\\"}; char SoundEngine::m_szRedistName[] = {"redist64"}; -#elif defined __ORBIS__ +#elif 0 #ifdef _CONTENT_PACKAGE char SoundEngine::m_szSoundPath[] = {"Sound/"}; @@ -108,11 +108,11 @@ char SoundEngine::m_szSoundPath[] = {"Durango/Sound/"}; #endif char SoundEngine::m_szMusicPath[] = {"music/"}; char SoundEngine::m_szRedistName[] = {"redist64"}; -#elif defined __PSVITA__ +#elif 0 char SoundEngine::m_szSoundPath[] = {"PSVita/Sound/"}; char SoundEngine::m_szMusicPath[] = {"music/"}; char SoundEngine::m_szRedistName[] = {"redist"}; -#elif defined __PS3__ +#elif 0 // extern const char* getPS3HomePath(); char SoundEngine::m_szSoundPath[] = {"PS3/Sound/"}; char SoundEngine::m_szMusicPath[] = {"music/"}; @@ -1047,18 +1047,18 @@ void SoundEngine::init(Options* pOptions) { #ifdef __DISABLE_MILES__ return; #endif -#ifdef __ORBIS__ +#if 0 C4JThread::PushAffinityAllCores(); #endif -#if defined _DURANGO || defined __ORBIS__ || defined __PS3__ || \ - defined __PSVITA__ +#if 0 || 0 || 0 || \ + 0 Register_RIB(BinkADec); #endif char* redistpath; #if (defined _WINDOWS64 || \ - defined __PSVITA__) // || defined _DURANGO || defined __ORBIS__ ) + 0) // || 0 || 0 ) redistpath = AIL_set_redist_directory(m_szRedistName); #endif @@ -1068,13 +1068,13 @@ void SoundEngine::init(Options* pOptions) { int iNumberOfChannels = initAudioHardware(8); // Create a driver to render our audio - 44khz, 16 bit, -#ifdef __PS3__ +#if 0 // On the Sony PS3, the driver is always opened in 48 kHz, 32-bit floating // point. The only meaningful configurations are MSS_MC_STEREO, // MSS_MC_51_DISCRETE, and MSS_MC_71_DISCRETE. m_hDriver = AIL_open_digital_driver(48000, 16, iNumberOfChannels, AIL_OPEN_DIGITAL_USE_SPU0); -#elif defined __PSVITA__ +#elif 0 // maximum of 16 samples AIL_set_preference(DIG_MIXER_CHANNELS, 16); @@ -1093,7 +1093,7 @@ void SoundEngine::init(Options* pOptions) { InitializeCriticalSection(&SoundEngine_MixerMutex); -#elif defined(__ORBIS__) +#elif 0 m_hDriver = AIL_open_digital_driver(48000, 16, 2, 0); app.DebugPrintf("---SoundEngine::init - AIL_open_digital_driver\n"); @@ -1104,14 +1104,14 @@ void SoundEngine::init(Options* pOptions) { app.DebugPrintf("Couldn't open digital sound driver. (%s)\n", AIL_last_error()); AIL_shutdown(); -#ifdef __ORBIS__ +#if 0 C4JThread::PopAffinity(); #endif return; } app.DebugPrintf("---SoundEngine::init - driver opened\n"); -#ifdef __PSVITA__ +#if 0 // set high falloff power for maximum spatial effect in software mode AIL_set_speaker_configuration(m_hDriver, 0, 0, 4.0F); @@ -1134,7 +1134,7 @@ void SoundEngine::init(Options* pOptions) { app.DebugPrintf("Couldn't init event system (%s).\n", AIL_last_error()); AIL_close_digital_driver(m_hDriver); AIL_shutdown(); -#ifdef __ORBIS__ +#if 0 C4JThread::PopAffinity(); #endif app.DebugPrintf( @@ -1142,7 +1142,7 @@ void SoundEngine::init(Options* pOptions) { return; } char szBankName[255]; -#if defined __PS3__ +#if 0 if (app.GetBootedFromDiscPatch()) { char szTempSoundFilename[255]; sprintf(szTempSoundFilename, "%s%s", m_szSoundPath, "Minecraft.msscmp"); @@ -1161,9 +1161,9 @@ void SoundEngine::init(Options* pOptions) { sprintf(szBankName, "%s/%s", getUsrDirPath(), m_szSoundPath); } -#elif defined __PSVITA__ +#elif 0 sprintf(szBankName, "%s/%s", getUsrDirPath(), m_szSoundPath); -#elif defined __ORBIS__ +#elif 0 sprintf(szBankName, "%s/%s", getUsrDirPath(), m_szSoundPath); #else strcpy((char*)szBankName, m_szSoundPath); @@ -1179,7 +1179,7 @@ void SoundEngine::init(Options* pOptions) { Error); AIL_close_digital_driver(m_hDriver); AIL_shutdown(); -#ifdef __ORBIS__ +#if 0 C4JThread::PopAffinity(); #endif return; @@ -1208,11 +1208,11 @@ void SoundEngine::init(Options* pOptions) { m_openStreamThread = NULL; -#ifdef __ORBIS__ +#if 0 C4JThread::PopAffinity(); #endif -#ifdef __PSVITA__ +#if 0 // AP - By default the mixer won't start up and nothing will process. Kick // off a blank sample to force the mixer to start up. HSAMPLE Sample = AIL_allocate_sample_handle(m_hDriver); @@ -1226,7 +1226,7 @@ void SoundEngine::init(Options* pOptions) { #endif } -#ifdef __ORBIS__ +#if 0 // void SoundEngine::SetHandle(int32_t hAudio) // { // //m_hAudio=hAudio; @@ -1235,12 +1235,12 @@ void SoundEngine::init(Options* pOptions) { // AP - moved to a separate function so it can be called from the mixer callback // on Vita void SoundEngine::updateMiles() { -#ifdef __PSVITA__ +#if 0 // CD - We must check for Background Music [BGM] at any point // If it's playing disable our audio, otherwise enable int NoBGMPlaying = sceAudioOutGetAdopt(SCE_AUDIO_OUT_PORT_TYPE_BGM); updateSystemMusicPlaying(!NoBGMPlaying); -#elif defined __ORBIS__ +#elif 0 // is the system playing background music? SceAudioOutPortState outPortState; sceAudioOutGetPortState(m_hBGMAudio, &outPortState); @@ -1480,7 +1480,7 @@ static float fVal = 0.0f; // ///////////////////////////////////////////// -#ifdef __PSVITA__ +#if 0 static S32 running = AIL_ms_count(); #endif @@ -1489,7 +1489,7 @@ void SoundEngine::tick(std::shared_ptr* players, float a) { return; #endif -#ifdef __PSVITA__ +#if 0 EnterCriticalSection(&SoundEngine_MixerMutex); #endif @@ -1541,7 +1541,7 @@ void SoundEngine::tick(std::shared_ptr* players, float a) { } m_validListenerCount = listenerCount; -#ifdef __PSVITA__ +#if 0 // AP - Show that a change has occurred so we know to update the values at // the next Mixer callback SoundEngine_Change = true; @@ -1577,7 +1577,7 @@ SoundEngine::SoundEngine() { memset(CurrentSoundsPlaying, 0, sizeof(int) * (eSoundType_MAX + eSFX_MAX)); memset(m_ListenerA, 0, sizeof(AUDIO_LISTENER) * XUSER_MAX_COUNT); -#ifdef __ORBIS__ +#if 0 m_hBGMAudio = GetAudioBGMHandle(); #endif } @@ -1794,7 +1794,7 @@ int SoundEngine::OpenStreamThreadProc(void* lpParameter) { ///////////////////////////////////////////// void SoundEngine::playMusicTick() { // AP - vita will update the music during the mixer callback -#ifndef __PSVITA__ +#if 1 playMusicUpdate(); #endif } @@ -1822,9 +1822,9 @@ void SoundEngine::playMusicUpdate() { if (m_musicID != -1) { // start playing it -#if (defined __PS3__ || defined __PSVITA__ || defined __ORBIS__) +#if (0 || 0 || 0) -#ifdef __PS3__ +#if 0 // 4J-PB - Need to check if we are a patched BD build if (app.GetBootedFromDiscPatch()) { sprintf(m_szStreamName, "%s/%s", @@ -1871,7 +1871,7 @@ void SoundEngine::playMusicUpdate() { m_MusicType = eMusicType_Game; m_StreamingAudioInfo.bIs3D = false; -#ifdef _XBOX_ONE +#if 0 std::wstring& wstrSoundName = dlcAudioFile->GetSoundName(m_musicID); std::wstring wstrFile = @@ -1908,7 +1908,7 @@ void SoundEngine::playMusicUpdate() { } else { // 4J-PB - if this is a PS3 disc patch, we have to check if // the music file is in the patch data -#ifdef __PS3__ +#if 0 if (app.GetBootedFromDiscPatch() && (m_musicID < m_iStream_CD_1)) { // rebuild the path for the music diff --git a/Minecraft.Client/Platform/Common/Audio/SoundEngine.h b/Minecraft.Client/Platform/Common/Audio/SoundEngine.h index 2b843288f..307c38781 100644 --- a/Minecraft.Client/Platform/Common/Audio/SoundEngine.h +++ b/Minecraft.Client/Platform/Common/Audio/SoundEngine.h @@ -19,7 +19,7 @@ enum eMUSICFILES { eStream_Overworld_hal4, eStream_Overworld_nuance1, eStream_Overworld_nuance2, -#ifndef _XBOX +#if 1 // Add the new music tracks eStream_Overworld_Creative1, eStream_Overworld_Creative2, @@ -129,7 +129,7 @@ public: private: float getMasterMusicVolume(); // platform specific functions -#ifdef __PS3__ +#if 0 int initAudioHardware(int iMinSpeakers); #else int initAudioHardware(int iMinSpeakers) { return iMinSpeakers; } @@ -177,7 +177,7 @@ private: int m_iStream_CD_1; bool* m_bHeardTrackA; -#ifdef __ORBIS__ +#if 0 int32_t m_hBGMAudio; #endif }; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Common/Audio/SoundNames.cpp b/Minecraft.Client/Platform/Common/Audio/SoundNames.cpp index 1fd88fccf..a284f3cc5 100644 --- a/Minecraft.Client/Platform/Common/Audio/SoundNames.cpp +++ b/Minecraft.Client/Platform/Common/Audio/SoundNames.cpp @@ -85,7 +85,7 @@ const WCHAR* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { L"ambient/weather/rain", // eSoundType_AMBIENT_WEATHER_RAIN, L"ambient/weather/thunder", // eSoundType_AMBIENT_WEATHER_THUNDER, L"ambient/cave/cave", // eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!! -#ifdef _XBOX +#if 0 L"ambient/cave/cave2", // eSoundType_CAVE_CAVE2 - removed the two sounds //that were at 192k in the first ambient cave event #endif diff --git a/Minecraft.Client/Platform/Common/Console_Awards_enum.h b/Minecraft.Client/Platform/Common/Console_Awards_enum.h index 9597c7170..5ae54a86f 100644 --- a/Minecraft.Client/Platform/Common/Console_Awards_enum.h +++ b/Minecraft.Client/Platform/Common/Console_Awards_enum.h @@ -30,7 +30,7 @@ enum eAward eAward_arrowKillCreeper, eAward_socialPost, -#ifndef _XBOX +#if 1 // 4J Stu - Does not map to any Xbox achievements eAward_snipeSkeleton, eAward_diamonds, diff --git a/Minecraft.Client/Platform/Common/Console_Utils.cpp b/Minecraft.Client/Platform/Common/Console_Utils.cpp index 85bceb5ce..f659b5f29 100644 --- a/Minecraft.Client/Platform/Common/Console_Utils.cpp +++ b/Minecraft.Client/Platform/Common/Console_Utils.cpp @@ -9,7 +9,7 @@ #ifndef _CONTENT_PACKAGE static void DebugSpewV(const char* strFormat, va_list pArgList) { -#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined(__linux__) +#if 0 || 0 || 0 || defined(__linux__) assert(0); #else char str[2048]; diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index f707024c3..7057f6c6a 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -1,4 +1,4 @@ - + #include "../Minecraft.World/Platform/stdafx.h" #include "../Minecraft.World/Recipes/Recipy.h" @@ -27,7 +27,7 @@ #include "../Minecraft.Client/GameState/GameMode.h" #include "../Minecraft.Client/Platform/Windows64/Social/SocialManager.h" #include "Tutorial/TutorialMode.h" -#if defined _XBOX || defined _WINDOWS64 +#if 0 || defined _WINDOWS64 #include "../Minecraft.Client/Platform/Common/XML/ATGXmlParser.h" #include "../Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h" #endif @@ -48,11 +48,11 @@ #include "../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #include "DLC/DLCPack.h" #include "../Minecraft.Client/Utils/StringTable.h" -#ifndef _XBOX +#if 1 #include "../Minecraft.Client/Utils/ArchiveFile.h" #endif #include "../Minecraft.Client/Minecraft.h" -#ifdef _XBOX +#if 0 #include "../Minecraft.Client/Platform/Windows64/GameConfig/Minecraft.spa.h" #include "XUI/XUI_TextEntry.h" #include "XUI/XUI_XZP_Icons.h" @@ -61,10 +61,10 @@ #include "UI/UI.h" #include "UI/UIScene_PauseMenu.h" #endif -#ifdef __PS3__ +#if 0 #include #endif -#ifdef __ORBIS__ +#if 0 #include #endif @@ -77,7 +77,7 @@ const float CMinecraftApp::fSafeZoneX = 64.0f; // 5% of 1280 const float CMinecraftApp::fSafeZoneY = 36.0f; // 5% of 720 int CMinecraftApp::s_iHTMLFontSizesA[eHTMLSize_COUNT] = { -#ifdef _XBOX +#if 0 14, 12, 14, 24 #else // 20,15,20,24 @@ -206,19 +206,19 @@ CMinecraftApp::CMinecraftApp() { m_bResetNether = false; -#ifdef _XBOX +#if 0 // m_bTransferSavesToXboxOne=false; // m_uiTransferSlotC=5; #endif -#if (defined _CONTENT_PACAKGE) || (defined _XBOX) +#if (defined _CONTENT_PACAKGE) || (0) m_bUseDPadForDebug = false; #else m_bUseDPadForDebug = true; #endif -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) for (int i = 0; i < XUSER_MAX_COUNT; i++) { m_eOptionsStatusA[i] = C4JStorage::eOptions_Callback_Idle; } @@ -230,7 +230,7 @@ CMinecraftApp::CMinecraftApp() { LocaleAndLanguageInit(); -#ifdef _XBOX_ONE +#if 0 m_hasReachedMainMenu = false; #endif } @@ -254,10 +254,10 @@ void CMinecraftApp::DebugPrintf(int user, const char* szFormat, ...) { va_start(ap, szFormat); vsnprintf(buf, sizeof(buf), szFormat, ap); va_end(ap); -#ifdef __PS3__ +#if 0 unsigned int writelen; sys_tty_write(SYS_TTYP_USER1 + (user - 1), buf, strlen(buf), &writelen); -#elif defined __PSVITA__ +#elif 0 switch (user) { case 0: { SceUID tty2 = sceIoOpen("tty2:", SCE_O_WRONLY, 0); @@ -282,7 +282,7 @@ void CMinecraftApp::DebugPrintf(int user, const char* szFormat, ...) { #else OutputDebugStringA(buf); #endif -#ifndef _XBOX +#if 1 if (user == USER_UI) { ui.logDebugString(buf); } @@ -321,7 +321,7 @@ void CMinecraftApp::SetAction(int iPad, eXuiAction action, void* param) { } bool CMinecraftApp::IsAppPaused() { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 bool paused = m_bIsAppPaused; EnterCriticalSection(&m_saveNotificationCriticalSection); if (g_NetworkManager.IsLocalGame() && @@ -737,8 +737,8 @@ bool CMinecraftApp::LoadBeaconMenu(int iPad, ////////////////////////////////////////////// void CMinecraftApp::InitGameSettings() { for (int i = 0; i < XUSER_MAX_COUNT; i++) { -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) GameSettingsA[i] = (GAME_SETTINGS*)StorageManager.GetGameDefinedProfileData(i); #else @@ -753,14 +753,14 @@ void CMinecraftApp::InitGameSettings() { // 4J-PB - adding in for Windows & PS3 to set the defaults for the // joypad -#if defined _WINDOWS64 // || defined __PSVITA__ +#if defined _WINDOWS64 // || 0 C_4JProfile::PROFILESETTINGS* pProfileSettings = ProfileManager.GetDashboardProfileSettings(i); // clear this for now - it will come from reading the system values memset(pProfileSettings, 0, sizeof(C_4JProfile::PROFILESETTINGS)); SetDefaultOptions(pProfileSettings, i); -#elif defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__ +#elif 0 || 0 || 0 || \ + 0 C4JStorage::PROFILESETTINGS* pProfileSettings = StorageManager.GetDashboardProfileSettings(i); // 4J-PB - don't cause an options write to happen here @@ -776,8 +776,8 @@ void CMinecraftApp::InitGameSettings() { } } -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) int CMinecraftApp::SetDefaultOptions(C4JStorage::PROFILESETTINGS* pSettings, const int iPad, bool bWriteProfile) #else @@ -858,7 +858,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS* pSettings, // Although probably best to leave in unless we split the profile settings // into platform specific classes - having different meaning per platform // for the same bitmask could get confusing - // #ifdef __PS3__ + // #ifdef 0 // PS3DEC13 SetGameSettings(iPad, eGameSetting_PS3_EULA_Read, 0); // EULA not read @@ -878,16 +878,16 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS* pSettings, // #endif -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) GameSettingsA[iPad]->bSettingsChanged = bWriteProfile; #endif return 0; } -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) int CMinecraftApp::DefaultOptionsCallback( void* pParam, C4JStorage::PROFILESETTINGS* pSettings, const int iPad) #else @@ -911,8 +911,8 @@ int CMinecraftApp::DefaultOptionsCallback( return 0; } -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) std::wstring CMinecraftApp::toStringOptionsStatus( const C4JStorage::eOptionsCallback& eStatus) { @@ -946,7 +946,7 @@ std::wstring CMinecraftApp::toStringOptionsStatus( #endif } -#ifdef __ORBIS__ +#if 0 int CMinecraftApp::OptionsDataCallback(void* pParam, int iPad, unsigned short usVersion, C4JStorage::eOptionsCallback eStatus, @@ -997,7 +997,7 @@ int CMinecraftApp::OldProfileVersionCallback(void* pParam, // one switch (usVersion) { -#ifdef _XBOX +#if 0 case PROFILE_VERSION_1: case PROFILE_VERSION_2: // need to fill in values for the new profile data. No need to save @@ -2452,8 +2452,8 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, if (iPad == XUSER_INDEX_ANY) { for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (GameSettingsA[i]->bSettingsChanged) { -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) StorageManager.WriteToProfile(i, true, bOverride5MinuteTimer); #else ProfileManager.WriteToProfile(i, true, bOverride5MinuteTimer); @@ -2463,8 +2463,8 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, } } else { if (GameSettingsA[iPad]->bSettingsChanged) { -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) StorageManager.WriteToProfile(iPad, true, bOverride5MinuteTimer); #else ProfileManager.WriteToProfile(iPad, true, bOverride5MinuteTimer); @@ -2825,7 +2825,7 @@ void CMinecraftApp::HandleXuiActions(void) { loadingParams->completionData = completionData; // 4J Stu - Xbox only -#ifdef _XBOX +#if 0 // Temporarily make this scene fullscreen CXuiSceneBase::SetPlayerBaseScenePosition( ProfileManager.GetPrimaryPad(), @@ -2844,7 +2844,7 @@ void CMinecraftApp::HandleXuiActions(void) { app.SetAutosaveTimerTime(); SetAction(i, eAppAction_Idle); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_AutoSaveGame); @@ -2893,7 +2893,7 @@ void CMinecraftApp::HandleXuiActions(void) { loadingParams->completionData = completionData; // 4J Stu - Xbox only -#ifdef _XBOX +#if 0 // Temporarily make this scene fullscreen CXuiSceneBase::SetPlayerBaseScenePosition( ProfileManager.GetPrimaryPad(), @@ -2914,8 +2914,8 @@ void CMinecraftApp::HandleXuiActions(void) { // Since the player is exiting, let's flush any profile // writes for them, and hope we're not breaking TCR // 136... -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) StorageManager.ForceQueuedProfileWrites(i); LeaderboardManager::Instance()->OpenSession(); for (int j = 0; j < XUSER_MAX_COUNT; j++) { @@ -2953,7 +2953,7 @@ void CMinecraftApp::HandleXuiActions(void) { ProfileManager.GetPrimaryPad()); pMinecraft->removeLocalPlayerIdx(i); -#ifdef _XBOX +#if 0 // tell the xui scenes a splitscreen player left - has // to come after removeLocalPlayerIdx which calls // updatePlayerViewportAssignments @@ -2973,7 +2973,7 @@ void CMinecraftApp::HandleXuiActions(void) { } #endif -#ifndef _XBOX +#if 1 // Wipe out the tooltips ui.SetTooltips(i, -1); #endif @@ -3022,7 +3022,7 @@ void CMinecraftApp::HandleXuiActions(void) { } } -#ifdef _DURANGO +#if 0 ProfileManager.RemoveGamepadFromGame(i); #endif @@ -3033,8 +3033,8 @@ void CMinecraftApp::HandleXuiActions(void) { int iPlayerC = g_NetworkManager.GetPlayerCount(); // Since the player is exiting, let's flush any profile // writes for them, and hope we're not breaking TCR 136... -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) StorageManager.ForceQueuedProfileWrites(i); #else ProfileManager.ForceQueuedProfileWrites(i); @@ -3049,7 +3049,7 @@ void CMinecraftApp::HandleXuiActions(void) { ProfileManager.GetPrimaryPad()); pMinecraft->removeLocalPlayerIdx(i); -#ifdef _XBOX +#if 0 // tell the xui scenes a splitscreen player left - has to // come after removeLocalPlayerIdx which calls // updatePlayerViewportAssignments @@ -3068,7 +3068,7 @@ void CMinecraftApp::HandleXuiActions(void) { } #endif -#ifndef _XBOX +#if 1 // Wipe out the tooltips ui.SetTooltips(i, -1); #endif @@ -3116,7 +3116,7 @@ void CMinecraftApp::HandleXuiActions(void) { SetAction(i, eAppAction_Idle); } break; -#ifdef __ORBIS__ +#if 0 case eAppAction_OptionsSaveNoSpace: { SetAction(i, eAppAction_Idle); @@ -3178,8 +3178,8 @@ void CMinecraftApp::HandleXuiActions(void) { // Since the player forced the exit, let's flush any profile // writes, and hope we're not breaking TCR 136... -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) StorageManager.ForceQueuedProfileWrites(); LeaderboardManager::Instance()->OpenSession(); for (int j = 0; j < XUSER_MAX_COUNT; j++) { @@ -3192,7 +3192,7 @@ void CMinecraftApp::HandleXuiActions(void) { } } LeaderboardManager::Instance()->CloseSession(); -#elif (defined _XBOX) +#elif (0) ProfileManager.ForceQueuedProfileWrites(); #endif @@ -3210,7 +3210,7 @@ void CMinecraftApp::HandleXuiActions(void) { ProfileManager.GetPrimaryPad()); pMinecraft->removeLocalPlayerIdx(i); -#ifdef _DURANGO +#if 0 ProfileManager.RemoveGamepadFromGame(i); #endif SetAction(i, eAppAction_Idle); @@ -3282,7 +3282,7 @@ void CMinecraftApp::HandleXuiActions(void) { // 4J Stu - Fix for #12368 - Crash: Game crashes when saving // then exiting and selecting to save for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { -#ifdef _XBOX +#if 0 app.TutorialSceneNavigateBack(idx, true); #endif @@ -3335,7 +3335,7 @@ void CMinecraftApp::HandleXuiActions(void) { // 4J Stu - Fix for #12368 - Crash: Game crashes when saving // then exiting and selecting to save for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { -#ifdef _XBOX +#if 0 app.TutorialSceneNavigateBack(idx, true); #endif @@ -3581,7 +3581,7 @@ void CMinecraftApp::HandleXuiActions(void) { } } } else { -#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 || 0 if (UIScene_LoadOrJoinMenu:: isSaveTransferRunning()) { // the save transfer is still in progress, delay @@ -3652,7 +3652,7 @@ void CMinecraftApp::HandleXuiActions(void) { // saving then exiting and selecting to save for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { -#ifdef _XBOX +#if 0 app.TutorialSceneNavigateBack(idx, true); #endif @@ -3738,7 +3738,7 @@ void CMinecraftApp::HandleXuiActions(void) { SetAction(i, eAppAction_Idle); // Check the player really wants to do this -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 // Show save option is saves ARE disabled if (ProfileManager.IsFullVersion() && StorageManager.GetSaveDisabled() && @@ -3812,7 +3812,7 @@ void CMinecraftApp::HandleXuiActions(void) { // 4J Stu - Fix for #12368 - Crash: Game crashes when saving // then exiting and selecting to save for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { -#ifdef _XBOX +#if 0 app.TutorialSceneNavigateBack(idx, true); #endif @@ -3845,7 +3845,7 @@ void CMinecraftApp::HandleXuiActions(void) { // need to stop the streaming audio - by playing // streaming audio from the default texture pack now // reset the streaming sounds back to the normal ones -#ifndef _XBOX +#if 1 pMinecraft->soundEngine->SetStreamingSounds( eStream_Overworld_Calm1, eStream_Overworld_piano3, eStream_Nether1, eStream_Nether4, @@ -3854,7 +3854,7 @@ void CMinecraftApp::HandleXuiActions(void) { pMinecraft->soundEngine->playStreaming(L"", 0, 0, 0, 1, 1); -#ifdef _XBOX +#if 0 if (pDLCTexPack->m_pStreamedWaveBank != NULL) { pDLCTexPack->m_pStreamedWaveBank->Destroy(); } @@ -3862,7 +3862,7 @@ void CMinecraftApp::HandleXuiActions(void) { pDLCTexPack->m_pSoundBank->Destroy(); } #endif -#ifdef _DURANGO +#if 0 const unsigned int result = StorageManager.UnmountInstalledDLC(L"TPACK"); #else @@ -3872,7 +3872,7 @@ void CMinecraftApp::HandleXuiActions(void) { app.DebugPrintf("Unmount result is %d\n", result); } -#ifdef _XBOX_ONE +#if 0 // 4J Stu - It's possible that we can sign in/remove players // between the mask initially being set and this point m_InviteData.dwLocalUsersMask = 0; @@ -3932,7 +3932,7 @@ void CMinecraftApp::HandleXuiActions(void) { ProfileManager.SetLockedProfile(inviteData->dwUserIndex); ProfileManager.SetPrimaryPad(inviteData->dwUserIndex); -#ifdef _XBOX_ONE +#if 0 // 4J Stu - If a player is signed in (i.e. locked) but not // in the mask, unlock them for (unsigned int index = 0; index < XUSER_MAX_COUNT; @@ -4020,7 +4020,7 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); -#ifdef __PS3__ +#if 0 completionData->bRequiresUserAction = FALSE; #else completionData->bRequiresUserAction = TRUE; @@ -4066,8 +4066,8 @@ void CMinecraftApp::HandleXuiActions(void) { } break; case eAppAction_SetDefaultOptions: SetAction(i, eAppAction_Idle); -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) SetDefaultOptions((C4JStorage::PROFILESETTINGS*)param, i); #else SetDefaultOptions((C_4JProfile::PROFILESETTINGS*)param, i); @@ -4169,7 +4169,7 @@ void CMinecraftApp::HandleXuiActions(void) { !g_NetworkManager.IsLeavingGame()) { TelemetryManager->RecordBanLevel(i); -#if defined _XBOX +#if 0 INetworkPlayer* pHost = g_NetworkManager.GetHostPlayer(); // write the level to the banned level list, and exit @@ -4177,7 +4177,7 @@ void CMinecraftApp::HandleXuiActions(void) { AddLevelToBannedLevelList( i, pHost->GetUID(), GetUniqueMapName(), true); -#elif defined _XBOX_ONE +#elif 0 INetworkPlayer* pHost = g_NetworkManager.GetHostPlayer(); AddLevelToBannedLevelList(i, pHost->GetUID(), @@ -4224,7 +4224,7 @@ void CMinecraftApp::HandleXuiActions(void) { case eAppAction_DebugText: // launch the xui for text entry { -#ifdef _XBOX +#if 0 CScene_TextEntry::XuiTextInputParams* pDebugTextParams = new CScene_TextEntry::XuiTextInputParams; pDebugTextParams->iPad = i; @@ -4256,7 +4256,7 @@ void CMinecraftApp::HandleXuiActions(void) { DLCManager::e_DLCType_Texture, L"")) { purchased = true; } -#ifdef _XBOX +#if 0 TelemetryManager->RecordTexturePackLoaded( i, pTexturePack->getId(), purchased ? 1 : 0); #endif @@ -4271,7 +4271,7 @@ void CMinecraftApp::HandleXuiActions(void) { } break; case eAppAction_ReloadFont: { -#ifndef _XBOX +#if 1 app.DebugPrintf( "[Consoles_App] eAppAction_ReloadFont, ingame='%s'.\n", app.GetGameStarted() ? "Yes" : "No"); @@ -4288,7 +4288,7 @@ void CMinecraftApp::HandleXuiActions(void) { } break; case eAppAction_TexturePackRequired: { -#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 || 0 unsigned int uiIDA[2]; uiIDA[0] = IDS_TEXTUREPACK_FULLVERSION; uiIDA[1] = IDS_CONFIRM_CANCEL; // let them continue without @@ -4302,7 +4302,7 @@ void CMinecraftApp::HandleXuiActions(void) { &CMinecraftApp::TexturePackDialogReturned, this); SetAction(i, eAppAction_Idle); #else -#ifdef _XBOX +#if 0 ULONGLONG ullOfferID_Full; app.GetDLCFullOfferIDForPackID( app.GetRequiredTexturePackID(), &ullOfferID_Full); @@ -4342,10 +4342,10 @@ void CMinecraftApp::HandleXuiActions(void) { // TMS++ actions case eTMSAction_TMSPP_RetrieveFiles_CreateLoad_SignInReturned: case eTMSAction_TMSPP_RetrieveFiles_RunPlayGame: -#ifdef _XBOX +#if 0 app.TMSPP_SetTitleGroupID(GROUP_ID); SetTMSAction(i, eTMSAction_TMSPP_GlobalFileList); -#elif defined _XBOX_ONE +#elif 0 SetTMSAction(i, eTMSAction_TMSPP_GlobalFileList_Waiting); app.TMSPP_RetrieveFileList(i, C4JStorage::eGlobalStorage_Title, @@ -4355,7 +4355,7 @@ void CMinecraftApp::HandleXuiActions(void) { #endif break; -#ifdef _XBOX +#if 0 case eTMSAction_TMSPP_GlobalFileList: SetTMSAction(i, eTMSAction_TMSPP_GlobalFileList_Waiting); app.TMSPP_RetrieveFileList( @@ -4365,12 +4365,12 @@ void CMinecraftApp::HandleXuiActions(void) { #endif case eTMSAction_TMSPP_UserFileList: // retrieve the file list first -#if defined _XBOX +#if 0 SetTMSAction(i, eTMSAction_TMSPP_UserFileList_Waiting); app.TMSPP_RetrieveFileList( i, C4JStorage::eGlobalStorage_TitleUser, "\\", eTMSAction_TMSPP_XUIDSFile); -#elif defined _XBOX_ONE +#elif 0 SetTMSAction(i, eTMSAction_TMSPP_UserFileList_Waiting); app.TMSPP_RetrieveFileList( i, C4JStorage::eGlobalStorage_TitleUser, @@ -4380,7 +4380,7 @@ void CMinecraftApp::HandleXuiActions(void) { #endif break; case eTMSAction_TMSPP_XUIDSFile: -#ifdef _XBOX +#if 0 SetTMSAction(i, eTMSAction_TMSPP_XUIDSFile_Waiting); // pass in the next app action on the call or callback // completing @@ -4391,7 +4391,7 @@ void CMinecraftApp::HandleXuiActions(void) { break; case eTMSAction_TMSPP_DLCFile: -#if defined _XBOX || defined _XBOX_ONE +#if 0 || 0 SetTMSAction(i, eTMSAction_TMSPP_DLCFile_Waiting); // pass in the next app action on the call or callback // completing @@ -4403,7 +4403,7 @@ void CMinecraftApp::HandleXuiActions(void) { case eTMSAction_TMSPP_BannedListFile: // If we have one in TMSPP, then we can assume we can ignore // TMS -#if defined _XBOX +#if 0 SetTMSAction(i, eTMSAction_TMSPP_BannedListFile_Waiting); // pass in the next app action on the call or callback // completing @@ -4415,7 +4415,7 @@ void CMinecraftApp::HandleXuiActions(void) { app.ReadBannedList( i, eTMSAction_TMS_RetrieveFiles_Complete, true); } -#elif defined _XBOX_ONE +#elif 0 SetTMSAction(i, eTMSAction_TMSPP_BannedListFile_Waiting); // pass in the next app action on the call or callback // completing @@ -4432,14 +4432,14 @@ void CMinecraftApp::HandleXuiActions(void) { case eTMSAction_TMSPP_RetrieveFiles_HelpAndOptions: case eTMSAction_TMSPP_RetrieveFiles_DLCMain: // retrieve the file list first -#if defined _XBOX +#if 0 // pass in the next app action on the call or callback // completing SetTMSAction(i, eTMSAction_TMSPP_XUIDSFile_Waiting); app.TMSPP_RetrieveFileList( i, C4JStorage::eGlobalStorage_Title, "\\", eTMSAction_TMSPP_DLCFileOnly); -#elif defined _XBOX_ONE +#elif 0 SetTMSAction(i, eTMSAction_TMSPP_GlobalFileList_Waiting); app.TMSPP_RetrieveFileList( i, C4JStorage::eGlobalStorage_Title, @@ -4449,12 +4449,12 @@ void CMinecraftApp::HandleXuiActions(void) { #endif break; case eTMSAction_TMSPP_RetrieveUserFilelist_DLCFileOnly: -#if defined _XBOX +#if 0 SetTMSAction(i, eTMSAction_TMSPP_UserFileList_Waiting); app.TMSPP_RetrieveFileList( i, C4JStorage::eGlobalStorage_TitleUser, "\\", eTMSAction_TMSPP_XUIDSFile); -#elif defined _XBOX_ONE +#elif 0 // StorageManager.TMSPP_DeleteFile(i,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"TP06.png",NULL,NULL, // 0); SetTMSAction(i, eTMSAction_TMSPP_UserFileList_Waiting); @@ -4468,7 +4468,7 @@ void CMinecraftApp::HandleXuiActions(void) { break; case eTMSAction_TMSPP_DLCFileOnly: -#if defined _XBOX || defined _XBOX_ONE +#if 0 || 0 SetTMSAction(i, eTMSAction_TMSPP_DLCFile_Waiting); // pass in the next app action on the call or callback // completing @@ -4486,7 +4486,7 @@ void CMinecraftApp::HandleXuiActions(void) { // TMS files /* case eTMSAction_TMS_RetrieveFiles_CreateLoad_SignInReturned: case - eTMSAction_TMS_RetrieveFiles_RunPlayGame: #ifdef _XBOX + eTMSAction_TMS_RetrieveFiles_RunPlayGame: #ifdef 0 SetTMSAction(i,eTMSAction_TMS_XUIDSFile_Waiting); // pass in the next app action on the call or callback completing @@ -4497,7 +4497,7 @@ void CMinecraftApp::HandleXuiActions(void) { break; case eTMSAction_TMS_DLCFile: - #ifdef _XBOX + #if 0 SetTMSAction(i,eTMSAction_TMS_DLCFile_Waiting); // pass in the next app action on the call or callback completing @@ -4510,7 +4510,7 @@ void CMinecraftApp::HandleXuiActions(void) { case eTMSAction_TMS_RetrieveFiles_HelpAndOptions: case eTMSAction_TMS_RetrieveFiles_DLCMain: - #ifdef _XBOX + #if 0 SetTMSAction(i,eTMSAction_TMS_DLCFile_Waiting); // pass in the next app action on the call or callback completing app.ReadDLCFileFromTMS(i,eTMSAction_Idle,true); @@ -4520,7 +4520,7 @@ void CMinecraftApp::HandleXuiActions(void) { break; case eTMSAction_TMS_BannedListFile: - #ifdef _XBOX + #if 0 SetTMSAction(i,eTMSAction_TMS_BannedListFile_Waiting); // pass in the next app action on the call or callback completing app.ReadBannedList(i, @@ -4556,11 +4556,11 @@ int CMinecraftApp::BannedLevelDialogReturned( // Minecraft *pMinecraft=Minecraft::GetInstance(); if (result == C4JStorage::EMessage_ResultAccept) { -#if defined _XBOX || defined _XBOX_ONE +#if 0 || 0 INetworkPlayer* pHost = g_NetworkManager.GetHostPlayer(); // unban the level if (pHost != NULL) { -#if defined _XBOX +#if 0 pApp->RemoveLevelFromBannedLevelList( iPad, pHost->GetUID(), pApp->GetUniqueMapName()); @@ -4584,17 +4584,17 @@ int CMinecraftApp::BannedLevelDialogReturned( void CMinecraftApp::loadMediaArchive() { std::wstring mediapath = L""; -#ifdef __PS3__ +#if 0 mediapath = L"Common\\Media\\MediaPS3.arc"; #elif _WINDOWS64 mediapath = L"Common\\Media\\MediaWindows64.arc"; #elif __linux__ mediapath = L"Common/Media/MediaLinux.arc"; -#elif __ORBIS__ +#elif 0 mediapath = L"Common\\Media\\MediaOrbis.arc"; -#elif _DURANGO +#elif 0 mediapath = L"Common\\Media\\MediaDurango.arc"; -#elif __PSVITA__ +#elif 0 mediapath = L"Common\\Media\\MediaPSVita.arc"; #endif @@ -4643,7 +4643,7 @@ void CMinecraftApp::loadMediaArchive() { } void CMinecraftApp::loadStringTable() { -#ifndef _XBOX +#if 1 if (m_stringTable != NULL) { // we need to unload the current std::string table, this is a reload @@ -4693,7 +4693,7 @@ int CMinecraftApp::EthernetDisconnectReturned( } else { // 4J-PB - turn off the PSN store icon just in case this happened when // we were in one of the DLC menus -#if defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 app.GetCommerce()->HidePsStoreIcon(); #endif app.SetAction(iPad, eAppAction_EthernetDisconnectedReturned_Menus); @@ -4729,7 +4729,7 @@ int CMinecraftApp::SignoutExitWorldThreadProc(void* lpParameter) { exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL; break; -#ifdef _XBOX +#if 0 case DisconnectPacket::eDisconnect_NoUGC_Remote: exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE; @@ -4791,7 +4791,7 @@ int CMinecraftApp::SignoutExitWorldThreadProc(void* lpParameter) { exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL; break; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 case DisconnectPacket::eDisconnect_ContentRestricted_AllLocal: exitReasonStringId = IDS_CONTENT_RESTRICTION_MULTIPLAYER; break; @@ -4800,7 +4800,7 @@ int CMinecraftApp::SignoutExitWorldThreadProc(void* lpParameter) { exitReasonStringId = IDS_CONTENT_RESTRICTION; break; #endif -#ifdef _XBOX +#if 0 case DisconnectPacket::eDisconnect_NoUGC_Remote: exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE; @@ -4854,7 +4854,7 @@ int CMinecraftApp::UnlockFullInviteReturned(void* pParam, int iPad, if (result == C4JStorage::EMessage_ResultAccept) { if (ProfileManager.IsSignedInLive(iPad)) { // 4J-PB - need to check this user can access the store -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 bool bContentRestricted; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), true, NULL, &bContentRestricted, @@ -4872,7 +4872,7 @@ int CMinecraftApp::UnlockFullInviteReturned(void* pParam, int iPad, false, iPad, eSen_UpsellID_Full_Version_Of_Game); } } -#if defined(__PS3__) +#if 0 else { // you're not signed in to PSN! unsigned int uiIDA[2]; @@ -4901,7 +4901,7 @@ int CMinecraftApp::UnlockFullSaveReturned(void* pParam, int iPad, if (result == C4JStorage::EMessage_ResultAccept) { if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 bool bContentRestricted; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), true, NULL, &bContentRestricted, @@ -4920,7 +4920,7 @@ int CMinecraftApp::UnlockFullSaveReturned(void* pParam, int iPad, eSen_UpsellID_Full_Version_Of_Game); } } -#if defined(__PS3__) +#if 0 else { // you're not signed in to PSN! unsigned int uiIDA[2]; @@ -4931,7 +4931,7 @@ int CMinecraftApp::UnlockFullSaveReturned(void* pParam, int iPad, ProfileManager.GetPrimaryPad(), &CMinecraftApp::MustSignInFullVersionPurchaseReturned, &app); } -#elif defined(__ORBIS__) +#elif 0 else { // Determine why they're not "signed in live" if (ProfileManager.isSignedInPSN(iPad)) { @@ -4970,7 +4970,7 @@ int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, if (result == C4JStorage::EMessage_ResultAccept) { if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 bool bContentRestricted; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), true, NULL, &bContentRestricted, @@ -4987,7 +4987,7 @@ int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, ProfileManager.DisplayFullVersionPurchase( false, pMinecraft->player->GetXboxPad(), eSen_UpsellID_Full_Version_Of_Game); -#if defined __ORBIS__ || defined __PS3__ || defined __PSVITA__ +#if 0 || 0 || 0 // still need to exit the trial or we'll be in the Pause menu // with input ignored pApp->SetAction(pMinecraft->player->GetXboxPad(), @@ -4995,7 +4995,7 @@ int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, #endif } } -#if defined(__PS3__) || defined __PSVITA__ +#if 0 || 0 else { // you're not signed in to PSN! unsigned int uiIDA[2]; @@ -5007,7 +5007,7 @@ int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, &CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial, &app); } -#elif defined(__ORBIS__) +#elif 0 else { // Determine why they're not "signed in live" if (ProfileManager.isSignedInPSN(iPad)) { @@ -5055,7 +5055,7 @@ int CMinecraftApp::TrialOverReturned(void* pParam, int iPad, // we need a signed in user for the unlock if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 bool bContentRestricted; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), true, NULL, &bContentRestricted, @@ -5074,7 +5074,7 @@ int CMinecraftApp::TrialOverReturned(void* pParam, int iPad, eSen_UpsellID_Full_Version_Of_Game); } } else { -#if defined(__PS3__) +#if 0 // you're not signed in to PSN! unsigned int uiIDA[2]; @@ -5098,7 +5098,7 @@ int CMinecraftApp::TrialOverReturned(void* pParam, int iPad, iPad, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, eSen_UpsellOutcome_Declined); -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 // 4J Stu - We can't actually exit the game, so just exit back to the // main menu pApp->SetAction(pMinecraft->player->GetXboxPad(), @@ -5139,7 +5139,7 @@ void CMinecraftApp::ClearSignInChangeUsersMask() { void CMinecraftApp::SignInChangeCallback(void* pParam, bool bPrimaryPlayerChanged, unsigned int uiSignInData) { -#ifdef __PS3__ +#if 0 // this is normally set in the main menu, but we can go online in the create // world screens, and the primary player name isn't updated Minecraft::GetInstance()->user->name = convStringToWstring( @@ -5268,7 +5268,7 @@ void CMinecraftApp::SignInChangeCallback(void* pParam, } } } -#ifdef __ORBIS__ +#if 0 // check if any of the addition players have signed out of // PSN (primary player is handled below) if (!switchToOffline && @@ -5304,7 +5304,7 @@ void CMinecraftApp::SignInChangeCallback(void* pParam, else if (pApp->GetLiveLinkRequired() && !ProfileManager.IsSignedInLive( ProfileManager.GetLockedProfile())) { -#ifdef __PSVITA__ +#if 0 if (!CGameNetworkManager::usingAdhocMode()) // if we're in // adhoc mode, we // can ignore this @@ -5315,8 +5315,8 @@ void CMinecraftApp::SignInChangeCallback(void* pParam, } } -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) // 4J-JEV: Need to kick of loading of profile data for sub-sign in // players. for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { @@ -5393,7 +5393,7 @@ void CMinecraftApp::NotificationsCallback(void* pParam, } break; case XN_SYS_STORAGEDEVICESCHANGED: { -#ifdef _XBOX +#if 0 // If the devices have changed, and we've got a dlc pack with audio // selected, and that pack's content device is no longer valid... // then pull the plug on audio streaming, as if we leave this until @@ -5434,14 +5434,14 @@ void CMinecraftApp::NotificationsCallback(void* pParam, pClass->m_vNotifications.push_back(pNotification); } -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 int CMinecraftApp::MustSignInFullVersionPurchaseReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { if (result == C4JStorage::EMessage_ResultAccept) { -#ifdef __PS3__ +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn( &CMinecraftApp::NowDisplayFullVersionPurchase, &app, true); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::AttemptPSNSignIn( &CMinecraftApp::NowDisplayFullVersionPurchase, &app, true); #else // __PS4__ @@ -5453,14 +5453,14 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturned( return 0; } -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial( void* pParam, int iPad, C4JStorage::EMessageResult result) { if (result == C4JStorage::EMessage_ResultAccept) { -#ifdef __PS3__ +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn( &CMinecraftApp::NowDisplayFullVersionPurchase, &app, true); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::AttemptPSNSignIn( &CMinecraftApp::NowDisplayFullVersionPurchase, &app, true); #else // __PS4__ @@ -5488,7 +5488,7 @@ void CMinecraftApp::UpsellReturnedCallback(void* pParam, eUpsellType type, int iUserData) { ESen_UpsellID senType; ESen_UpsellOutcome senResponse; -#ifdef __PS3__ +#if 0 unsigned int uiIDA[2]; #endif @@ -5500,7 +5500,7 @@ void CMinecraftApp::UpsellReturnedCallback(void* pParam, eUpsellType type, case eUpsellResponse_Accepted_Purchase: senResponse = eSen_UpsellOutcome_Accepted; break; -#ifdef __PS3__ +#if 0 // special case for people who are not signed in to the PSN while // playing the trial game case eUpsellResponse_UserNotSignedInPSN: @@ -5678,7 +5678,7 @@ void CMinecraftApp::MountNextDLC(int iPad) { ui.HandleDLCMountingComplete(); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 // Check if the current texture pack is now installed if (!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) { TexturePack* tPack = Minecraft::GetInstance()->skins->getSelected(); @@ -5693,7 +5693,7 @@ void CMinecraftApp::MountNextDLC(int iPad) { } } #endif -#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 || 0 { TexturePack* currentTPack = Minecraft::GetInstance()->skins->getSelected(); @@ -5710,7 +5710,7 @@ void CMinecraftApp::MountNextDLC(int iPad) { } // 4J-JEV: For the sake of clarity in DLCMountedCallback. -#if defined(_XBOX) || defined(__PS3__) || defined(_WINDOWS64) +#if 0 || 0 || defined(_WINDOWS64) #define CONTENT_DATA_DISPLAY_NAME(a) (a.szDisplayName) #else #define CONTENT_DATA_DISPLAY_NAME(a) (a.wszDisplayName) @@ -5719,9 +5719,9 @@ void CMinecraftApp::MountNextDLC(int iPad) { int CMinecraftApp::DLCMountedCallback(void* pParam, int iPad, std::uint32_t dwErr, std::uint32_t dwLicenceMask) { -#if defined(_XBOX) || defined(_DURANGO) || defined(__PS3__) || \ - defined(__ORBIS__) || defined(_WINDOWS64) || \ - defined(__PSVITA__) // Chris TODO +#if 0 || 0 || 0 || \ + 0 || defined(_WINDOWS64) || \ + 0 // Chris TODO app.DebugPrintf("--- CMinecraftApp::DLCMountedCallback\n"); if (dwErr != ERROR_SUCCESS) { @@ -5748,9 +5748,9 @@ int CMinecraftApp::DLCMountedCallback(void* pParam, int iPad, app.DebugPrintf("Pack \"%ls\" is not installed, so adding it\n", CONTENT_DATA_DISPLAY_NAME(ContentData)); -#if defined(_XBOX) || defined(__PS3__) || defined(_WINDOWS64) +#if 0 || 0 || defined(_WINDOWS64) pack = new DLCPack(ContentData.szDisplayName, dwLicenceMask); -#elif defined _XBOX_ONE +#elif 0 pack = new DLCPack(ContentData.wszDisplayName, ContentData.wszProductID, dwLicenceMask); #else @@ -5781,7 +5781,7 @@ int CMinecraftApp::DLCMountedCallback(void* pParam, int iPad, ++app.m_iTotalDLCInstalled; app.MountNextDLC(iPad); -#endif // __PSVITA__ +#endif // 0 return 0; } #undef CONTENT_DATA_DISPLAY_NAME @@ -5816,15 +5816,15 @@ int CMinecraftApp::DLCMountedCallback(void* pParam, int iPad, void CMinecraftApp::HandleDLC(DLCPack* pack) { unsigned int dwFilesProcessed = 0; -#ifndef _XBOX -#if defined(__PS3__) || defined(__ORBIS__) || defined(_WINDOWS64) || \ - defined(__PSVITA__) || defined(__linux__) +#if 1 +#if 0 || 0 || defined(_WINDOWS64) || \ + 0 || defined(__linux__) std::vector dlcFilenames; -#elif defined _DURANGO +#elif 0 std::vector dlcFilenames; #endif StorageManager.GetMountedDLCFileList("DLCDrive", dlcFilenames); -#ifdef __ORBIS__ +#if 0 // 4J Stu - I don't know why we handle more than one file here any more, // however this doesn't seem to work with the PS4 patches if (dlcFilenames.size() > 0) @@ -5856,7 +5856,7 @@ void CMinecraftApp::HandleDLC(DLCPack* pack) { if ((GetFileAttributes(szFullFilename) & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) { -#ifdef _XBOX +#if 0 std::uint32_t dwPackID = m_dlcManager.retrievePackIDFromDLCDataFile(szFullFilename, pack); @@ -5885,7 +5885,7 @@ void CMinecraftApp::HandleDLC(DLCPack* pack) { // Close the find handle. FindClose(hFind); } -#endif // __PS3__ || __ORBIS__ +#endif // 0 || 0 if (dwFilesProcessed == 0) m_dlcManager.removePack(pack); } @@ -6094,7 +6094,7 @@ void CMinecraftApp::RemoveMemoryTPDFile(int iConfig) { LeaveCriticalSection(&csMemTPDLock); } -#ifdef _XBOX +#if 0 int CMinecraftApp::GetTPConfigVal(WCHAR* pwchDataFile) { DLC_INFO* pDLCInfo = NULL; // run through the DLC info to find the right texture pack/mash-up pack @@ -6109,7 +6109,7 @@ int CMinecraftApp::GetTPConfigVal(WCHAR* pwchDataFile) { return -1; } -#elif defined _XBOX_ONE +#elif 0 int CMinecraftApp::GetTPConfigVal(WCHAR* pwchDataFile) { DLC_INFO* pDLCInfo = NULL; // run through the DLC info to find the right texture pack/mash-up pack @@ -6226,7 +6226,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( // upsell // get the dlc texture pack -#ifdef _XBOX +#if 0 DLCTexturePack* pDLCTexPack = (DLCTexturePack*)tPack; ULONGLONG ullOfferID_Full; app.GetDLCFullOfferIDForPackID( @@ -6254,7 +6254,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( return S_OK; } } -#ifndef _XBOX_ONE +#if 1 // does the save exist? bool bSaveExists; StorageManager.DoesSaveExist(&bSaveExists); @@ -6274,7 +6274,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned( } else #endif { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 StorageManager.SetSaveDisabled(false); #endif MinecraftServer::getInstance()->setSaveOnExit(true); @@ -6302,7 +6302,7 @@ int CMinecraftApp::WarningTrialTexturePackReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // 4J Stu - I added this in when fixing an X1 bug. We should probably add // this as well but I don't have time to test all platforms atm -#if 0 // defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 // 0 || 0 || 0 if(result==C4JStorage::EMessage_ResultAccept) { if(!ProfileManager.IsSignedInLive(iPad)) @@ -6342,14 +6342,14 @@ int CMinecraftApp::WarningTrialTexturePackReturned( // find the info on the skin pack // we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it. // So we assume the first sku for the product is the one we want -#ifdef __ORBIS__ +#if 0 sprintf(chName,"%s",pSONYDLCInfo->chDLCKeyname); #else sprintf(chName,"%s-%s",app.GetCommerceCategory(),pSONYDLCInfo->chDLCKeyname); #endif app.GetDLCSkuIDFromProductList(chName,chSkuID); // 4J-PB - need to check for an empty store -#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__ +#if 0 || 0 || 0 if(app.CheckForEmptyStore(iPad)==false) #endif { @@ -6368,7 +6368,7 @@ int CMinecraftApp::WarningTrialTexturePackReturned( } #endif // -#ifdef _XBOX_ONE +#if 0 if (result == C4JStorage::EMessage_ResultAccept) { if (ProfileManager.IsSignedIn(iPad)) { if (ProfileManager.IsSignedInLive(iPad)) { @@ -6393,14 +6393,14 @@ int CMinecraftApp::WarningTrialTexturePackReturned( // Trial to Full texture pack and is not messaged why. unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad); } } } #endif -#ifdef _XBOX +#if 0 CMinecraftApp* pClass = (CMinecraftApp*)pParam; @@ -6453,7 +6453,7 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned( // upsell // get the dlc texture pack -#ifdef _XBOX +#if 0 DLCTexturePack* pDLCTexPack = (DLCTexturePack*)tPack; ULONGLONG ullOfferID_Full; app.GetDLCFullOfferIDForPackID( @@ -6495,7 +6495,7 @@ int CMinecraftApp::ExitAndJoinFromInviteDeclineSaveReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 StorageManager.SetSaveDisabled(false); #endif MinecraftServer::getInstance()->setSaveOnExit(false); @@ -6820,21 +6820,21 @@ std::wstring CMinecraftApp::FormatHTMLString( GetActionReplacement(iPad, MINECRAFT_ACTION_DPAD_RIGHT)); text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}", GetActionReplacement(iPad, MINECRAFT_ACTION_DPAD_LEFT)); -#if defined _XBOX_ONE || defined __PSVITA__ +#if 0 || 0 text = replaceAll(text, L"{*CONTROLLER_VK_START*}", GetVKReplacement(VK_PAD_START)); text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}", GetVKReplacement(VK_PAD_BACK)); #endif -#ifdef _XBOX +#if 0 std::wstring imageRoot = L""; Minecraft* pMinecraft = Minecraft::GetInstance(); imageRoot = pMinecraft->skins->getSelected()->getXuiRootPath(); text = replaceAll(text, L"{*IMAGEROOT*}", imageRoot); -#endif // _XBOX +#endif // 0 // Fix for #8903 - UI: Localization: KOR/JPN/CHT: Button Icons are rendered // with padding space, which looks no good @@ -6855,7 +6855,7 @@ std::wstring CMinecraftApp::GetActionReplacement(int iPad, unsigned int input = InputManager.GetGameJoypadMaps( InputManager.GetJoypadMapVal(iPad), ucAction); -#ifdef _XBOX +#if 0 switch (input) { case _360_JOY_BUTTON_A: return app.GetString(IDS_CONTROLLER_A); @@ -6951,7 +6951,7 @@ std::wstring CMinecraftApp::GetActionReplacement(int iPad, wchar_t string[128]; -#ifdef __PS3__ +#if 0 int size = 30; #elif defined _WIN64 int size = 45; @@ -6969,7 +6969,7 @@ std::wstring CMinecraftApp::GetActionReplacement(int iPad, } std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { -#ifdef _XBOX +#if 0 switch (uiVKey) { case VK_PAD_A: return app.GetString(IDS_CONTROLLER_A); @@ -7013,7 +7013,7 @@ std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { std::wstring replacement = L""; switch (uiVKey) { case VK_PAD_A: -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (InputManager.IsCircleCrossSwapped()) replacement = L"ButtonB"; else @@ -7023,7 +7023,7 @@ std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { #endif break; case VK_PAD_B: -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (InputManager.IsCircleCrossSwapped()) replacement = L"ButtonA"; else @@ -7070,7 +7070,7 @@ std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { case VK_PAD_RTHUMB_DOWNLEFT: replacement = L"ButtonRightStick"; break; -#if defined _XBOX_ONE || defined __PSVITA__ +#if 0 || 0 case VK_PAD_START: replacement = L"ButtonStart"; break; @@ -7083,7 +7083,7 @@ std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { } wchar_t string[128]; -#ifdef __PS3__ +#if 0 int size = 30; #elif defined _WIN64 int size = 45; @@ -7101,7 +7101,7 @@ std::wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey) { } std::wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon) { -#ifdef _XBOX +#if 0 switch (uiIcon) { case XZP_ICON_SHANK_01: return app.GetString(IDS_ICON_SHANK_01); @@ -7114,7 +7114,7 @@ std::wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon) { #else wchar_t string[128]; -#ifdef __PS3__ +#if 0 int size = 22; #elif defined _WIN64 int size = 33; @@ -7142,13 +7142,13 @@ std::wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon) { #endif } -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 std::unordered_map CMinecraftApp::MojangData; std::unordered_map CMinecraftApp::DLCTextures_PackID; std::unordered_map CMinecraftApp::DLCInfo; std::unordered_map CMinecraftApp::DLCInfo_SkinName; -#elif defined(_DURANGO) +#elif 0 std::unordered_map CMinecraftApp::MojangData; std::unordered_map @@ -7205,7 +7205,7 @@ MOJANG_DATA* CMinecraftApp::GetMojangDataForXuid(PlayerUID xuid) { HRESULT CMinecraftApp::RegisterConfigValues(WCHAR* pType, int iValue) { HRESULT hr = S_OK; - // #ifdef _XBOX + // #ifdef 0 // if(pType!=NULL) // { // if(wcscmp(pType,L"XboxOneTransfer")==0) @@ -7230,7 +7230,7 @@ HRESULT CMinecraftApp::RegisterConfigValues(WCHAR* pType, int iValue) { return hr; } -#if (defined _XBOX || defined _WINDOWS64) +#if (0 || defined _WINDOWS64) HRESULT CMinecraftApp::RegisterDLCData(WCHAR* pType, WCHAR* pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, @@ -7247,7 +7247,7 @@ HRESULT CMinecraftApp::RegisterDLCData(WCHAR* pType, WCHAR* pBannerName, pDLCData->uiSortIndex = uiSortIndex; pDLCData->iConfig = iConfig; -#ifndef __ORBIS__ +#if 1 // ignore the names if we don't recognize them if (pBannerName != L"") { wcsncpy_s(pDLCData->wchBanner, pBannerName, MAX_BANNERNAME_SIZE); @@ -7282,7 +7282,7 @@ HRESULT CMinecraftApp::RegisterDLCData(WCHAR* pType, WCHAR* pBannerName, return hr; } -#elif defined _XBOX_ONE +#elif 0 std::unordered_map* CMinecraftApp::GetDLCInfo() { return &DLCInfo_Full; @@ -7343,7 +7343,7 @@ HRESULT CMinecraftApp::RegisterDLCData(eDLCContentType eType, if (pwchFirstSkin[0] != 0) DLCInfo_SkinName[pwchFirstSkin] = pDLCData->wsProductId; -#ifdef _XBOX_ONE +#if 0 // ignore the names, and use the product id instead DLCInfo_Full[pDLCData->wsProductId] = pDLCData; #else @@ -7418,7 +7418,7 @@ HRESULT CMinecraftApp::RegisterDLCData(char* pchDLCName, } #endif -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, ULONGLONG* pullVal) { AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin)); @@ -7487,7 +7487,7 @@ char* CMinecraftApp::GetDLCInfoTextures(int iIndex) { return it->second; } -#elif defined _XBOX_ONE +#elif 0 bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, std::wstring& ProductId) { AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin)); @@ -7603,7 +7603,7 @@ ULONGLONG CMinecraftApp::GetDLCInfoTexturesFullOffer(int iIndex) { } #endif -#ifdef _XBOX_ONE +#if 0 DLC_INFO* CMinecraftApp::GetDLCInfoForFullOfferID(WCHAR* pwchProductID) { std::wstring wsTemp = pwchProductID; @@ -7635,7 +7635,7 @@ DLC_INFO* CMinecraftApp::GetDLCInfoForProductName(WCHAR* pwchProductName) { return NULL; } -#elif defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#elif 0 || 0 || 0 #else DLC_INFO* CMinecraftApp::GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full) { @@ -7762,13 +7762,13 @@ int CMinecraftApp::ExitGameFromRemoteSaveDialogReturned( if (result == C4JStorage::EMessage_ResultDecline) { app.SetAction(iPad, eAppAction_ExitWorld); } else { -#ifndef _XBOX +#if 1 // Inform fullscreen progress scene that it's not being cancelled after // all UIScene_FullscreenProgress* pScene = (UIScene_FullscreenProgress*)ui.FindScene( eUIScene_FullscreenProgress); -#ifdef __PS3__ +#if 0 if (pScene != NULL) #else if (pScene != nullptr) @@ -7810,7 +7810,7 @@ void CMinecraftApp::InvalidateBannedList(int iPad) { } } -#ifdef _XBOX_ONE +#if 0 void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PBANNEDLISTDATA pBannedListData, bool bWriteToTMS) { @@ -7830,7 +7830,7 @@ void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, BANNEDLISTDATA* pBannedListData = new BANNEDLISTDATA; memset(pBannedListData, 0, sizeof(BANNEDLISTDATA)); -#ifdef _DURANGO +#if 0 memcpy(&pBannedListData->wchPlayerUID, xuid.toString().c_str(), sizeof(WCHAR) * 64); #else @@ -7856,12 +7856,12 @@ void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, // bool // bRes=StorageManager.WriteTMSFile(iPad,C4JStorage::eGlobalStorage_TitleUser,L"BannedList",(std::uint8_t*)pBannedList, // dwDataBytes); -#ifdef _XBOX +#if 0 StorageManager.TMSPP_WriteFile( iPad, C4JStorage::eGlobalStorage_TitleUser, C4JStorage::TMS_FILETYPE_BINARY, C4JStorage::TMS_UGCTYPE_NONE, "BannedList", (PCHAR)pBannedList, dataBytes, NULL, NULL, 0); -#elif defined _XBOX_ONE +#elif 0 StorageManager.TMSPP_WriteFile( iPad, C4JStorage::eGlobalStorage_TitleUser, C4JStorage::TMS_FILETYPE_BINARY, L"BannedList", @@ -7878,7 +7878,7 @@ bool CMinecraftApp::IsInBannedLevelList(int iPad, PlayerUID xuid, for (AUTO_VAR(it, m_vBannedListA[iPad]->begin()); it != m_vBannedListA[iPad]->end(); ++it) { PBANNEDLISTDATA pData = *it; -#ifdef _XBOX_ONE +#if 0 PlayerUID bannedPlayerUID = pData->wchPlayerUID; if (IsEqualXUID(bannedPlayerUID, xuid) && (strcmp(pData->pszLevelName, pszLevelName) == 0)) @@ -7906,7 +7906,7 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, PBANNEDLISTDATA pBannedListData = *it; if (pBannedListData != NULL) { -#ifdef _XBOX_ONE +#if 0 PlayerUID bannedPlayerUID = pBannedListData->wchPlayerUID; if (IsEqualXUID(bannedPlayerUID, xuid) && (strcmp(pBannedListData->pszLevelName, pszLevelName) == 0)) @@ -7932,10 +7932,10 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, static_cast(sizeof(BANNEDLISTDATA) * bannedListCount); if (dataBytes == 0) { // wipe the file -#ifdef _XBOX +#if 0 StorageManager.DeleteTMSFile(iPad, C4JStorage::eGlobalStorage_TitleUser, L"BannedList"); -#elif defined _XBOX_ONE +#elif 0 StorageManager.TMSPP_DeleteFile( iPad, C4JStorage::eGlobalStorage_TitleUser, C4JStorage::TMS_FILETYPE_BINARY, L"BannedList", NULL, NULL, 0); @@ -7949,11 +7949,11 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, memcpy(&pBannedList[i], pBannedListData, sizeof(BANNEDLISTDATA)); } -#ifdef _XBOX +#if 0 StorageManager.WriteTMSFile(iPad, C4JStorage::eGlobalStorage_TitleUser, L"BannedList", (std::uint8_t*)pBannedList, dataBytes); -#elif defined _XBOX_ONE +#elif 0 StorageManager.TMSPP_WriteFile( iPad, C4JStorage::eGlobalStorage_TitleUser, C4JStorage::TMS_FILETYPE_BINARY, L"BannedList", (PBYTE)pBannedList, @@ -8392,7 +8392,7 @@ unsigned char CMinecraftApp::m_szPNG[8] = {137, 80, 78, 71, 13, 10, 26, 10}; #define PNG_TAG_tEXt 0x74455874 unsigned int CMinecraftApp::FromBigEndian(unsigned int uiValue) { -#if defined(__PS3__) || defined(_XBOX) +#if 0 || 0 // Keep it in big endian return uiValue; #else @@ -8688,7 +8688,7 @@ std::wstring CMinecraftApp::getEntityName(eINSTANCEOF type) { std::uint32_t CMinecraftApp::m_dwContentTypeA[e_Marketplace_MAX] = { XMARKETPLACE_OFFERING_TYPE_CONTENT, // e_DLC_SkinPack, e_DLC_TexturePacks, // e_DLC_MashupPacks -#ifndef _XBOX_ONE +#if 1 XMARKETPLACE_OFFERING_TYPE_THEME, // e_DLC_Themes XMARKETPLACE_OFFERING_TYPE_AVATARITEM, // e_DLC_AvatarItems XMARKETPLACE_OFFERING_TYPE_TILE, // e_DLC_Gamerpics @@ -8743,7 +8743,7 @@ unsigned int CMinecraftApp::AddDLCRequest(eDLCMarketplaceType eType, unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool bPromote) { -#if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__) +#if !0 && !0 && !0 // lock access EnterCriticalSection(&csTMSPPDownloadQueue); @@ -8855,7 +8855,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, // run through the trial offers first, then the full offers. Any // duplicates won't be added to the download queue int iCount; -#ifdef _XBOX // Only trial offers on Xbox 360 +#if 0 // Only trial offers on Xbox 360 iCount = GetDLCInfoTrialOffersCount(); for (int i = 0; i < iCount; i++) { DLC_INFO* pDLC = GetDLCInfoTrialOffer(i); @@ -9061,8 +9061,8 @@ bool CMinecraftApp::RetrieveNextDLCContent() { return false; } -#if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__) -#ifdef _XBOX_ONE +#if !0 && !0 && !0 +#if 0 int CMinecraftApp::TMSPPFileReturned(void* pParam, int iPad, int iUserData, void* lpvData, WCHAR* wchFilename) { C4JStorage::PTMSPP_FILEDATA pFileData = @@ -9080,12 +9080,12 @@ int CMinecraftApp::TMSPPFileReturned(void* pParam, int iPad, int iUserData, for (AUTO_VAR(it, pClass->m_TMSPPDownloadQueue.begin()); it != pClass->m_TMSPPDownloadQueue.end(); ++it) { TMSPPRequest* pCurrent = *it; -#if defined(_XBOX) || defined(_WINDOWS64) +#if 0 || defined(_WINDOWS64) char szFile[MAX_TMSFILENAME_SIZE]; wcstombs(szFile, pCurrent->wchFilename, MAX_TMSFILENAME_SIZE); if (strcmp(szFilename, szFile) == 0) -#elif _XBOX_ONE +#elif 0 if (wcscmp(wchFilename, pCurrent->wchFilename) == 0) #endif { @@ -9093,7 +9093,7 @@ int CMinecraftApp::TMSPPFileReturned(void* pParam, int iPad, int iUserData, pCurrent->eState = e_TMS_ContentState_Retrieved; if (pFileData != NULL) { -#ifdef _XBOX_ONE +#if 0 switch (pCurrent->eType) { case e_DLC_TexturePackData: { @@ -9153,7 +9153,7 @@ int CMinecraftApp::TMSPPFileReturned(void* pParam, int iPad, int iUserData, } #endif } else { -#ifdef _XBOX_ONE +#if 0 app.DebugPrintf("TMSImageReturned failed (%ls)...\n", wchFilename); #else @@ -9171,7 +9171,7 @@ int CMinecraftApp::TMSPPFileReturned(void* pParam, int iPad, int iUserData, #endif bool CMinecraftApp::RetrieveNextTMSPPContent() { -#if defined _XBOX || defined _XBOX_ONE +#if 0 || 0 // If there's already a retrieve in progress, quit // we may have re-ordered the list, so need to check every item @@ -9203,7 +9203,7 @@ bool CMinecraftApp::RetrieveNextTMSPPContent() { // retrieve it from the remote TMS in case it's been changed. If // it's not in the list of TMS files, this will return right away // with a ETMSStatus_Fail_ReadDetailsNotRetrieved -#ifdef _XBOX +#if 0 char szFilename[MAX_TMSFILENAME_SIZE]; wcstombs(szFilename, pCurrent->wchFilename, MAX_TMSFILENAME_SIZE); @@ -9572,7 +9572,7 @@ std::wstring CMinecraftApp::getSkinPathFromId(std::uint32_t skinId) { int CMinecraftApp::TexturePackDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { -#if defined __PSVITA__ || defined __PS3__ || defined __ORBIS__ +#if 0 || 0 || 0 if (result == C4JStorage::EMessage_ResultAccept) { Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft->skins->selectTexturePackById( @@ -9597,7 +9597,7 @@ int CMinecraftApp::TexturePackDialogReturned( memset(chKeyName, 0, sizeof(chKeyName)); strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16); -#ifdef __ORBIS__ +#if 0 strcpy(chName, chKeyName); #else sprintf(chName, "%s-%s", app.GetCommerceCategory(), chKeyName); @@ -9618,7 +9618,7 @@ int CMinecraftApp::TexturePackDialogReturned( } #endif -#ifdef _XBOX +#if 0 if (result != C4JStorage::EMessage_Cancelled) { if (app.GetRequiredTexturePackID() != 0) { // we need to enable background downloading for the DLC @@ -9684,9 +9684,9 @@ byteArray CMinecraftApp::getArchiveFile(const std::wstring& filename) { // DLC -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 int CMinecraftApp::GetDLCInfoCount() { return (int)DLCInfo.size(); } -#elif defined _XBOX_ONE +#elif 0 int CMinecraftApp::GetDLCInfoTrialOffersCount() { return 0; } int CMinecraftApp::GetDLCInfoFullOffersCount() { @@ -9708,7 +9708,7 @@ int CMinecraftApp::GetDLCInfoTexturesOffersCount() { // AUTOSAVE void CMinecraftApp::SetAutosaveTimerTime(void) { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 m_uiAutosaveTimer = GetTickCount() + 1000 * 60; #else m_uiAutosaveTimer = @@ -9744,7 +9744,7 @@ bool CMinecraftApp::IsLocalMultiplayerAvailable() { bool available = RenderManager.IsHiDef() && connectedControllers > 1; -#ifdef __ORBIS__ +#if 0 // Check for remote play available = available && InputManager.IsLocalMultiplayerAvailable(); #endif @@ -9752,7 +9752,7 @@ bool CMinecraftApp::IsLocalMultiplayerAvailable() { return available; // Found this in GameNetworkManager? - // #ifdef _DURANGO + // #ifdef 0 // iOtherConnectedControllers = // InputManager.GetConnectedGamepadCount(); // if((InputManager.IsPadConnected(userIndex) || @@ -9781,7 +9781,7 @@ void CMinecraftApp::getLocale(std::vector& vecWstrLocales) { // 4J-PB - restrict the 360 language until we're ready to have them in -#ifdef _XBOX +#if 0 switch (systemLanguage) { case XC_LANGUAGE_FRENCH: locales.push_back(eMCLang_frFR); @@ -9953,8 +9953,8 @@ void CMinecraftApp::getLocale(std::vector& vecWstrLocales) { locales.push_back(eMCLang_zhCN); break; -#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || \ - defined _DURANGO +#if 0 || 0 || 0 || \ + 0 case XC_LANGUAGE_DANISH: locales.push_back(eMCLang_daDA); locales.push_back(eMCLang_daDK); @@ -10163,7 +10163,7 @@ void CMinecraftApp::LocaleAndLanguageInit() { m_xcLangA[L"pl-PL"] = XC_LOCALE_POLAND; m_xcLangA[L"tr-TR"] = XC_LOCALE_TURKEY; m_xcLangA[L"el-EL"] = XC_LOCALE_GREECE; -#ifndef _XBOX +#if 1 m_xcLangA[L"la-LAS"] = XC_LOCALE_LATIN_AMERICA; #endif @@ -10224,7 +10224,7 @@ std::wstring CMinecraftApp::getFilePath(std::uint32_t packId, return getRootPath(packId, false, true, mountPoint) + filename; } -#ifdef _XBOX +#if 0 // Texture packs that have their data in the TU data enum ETitleUpdateTexturePacks { eTUTP_MassEffect = 0x400, @@ -10268,11 +10268,11 @@ enum ETitleUpdateTexturePacks { #ifdef _WINDOWS64 std::wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\"; -#elif defined(__ORBIS__) +#elif 0 std::wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/"; -#elif defined(__PSVITA__) +#elif 0 std::wstring titleUpdateTexturePackRoot = L"PSVita/CU/DLC/"; -#elif defined(__PS3__) +#elif 0 std::wstring titleUpdateTexturePackRoot = L"PS3/CU/DLC/"; #else std::wstring titleUpdateTexturePackRoot = L"CU\\DLC\\"; @@ -10284,7 +10284,7 @@ std::wstring CMinecraftApp::getRootPath(std::uint32_t packId, bool allowOverride, bool bAddDataFolder, std::wstring mountPoint) { std::wstring path = mountPoint; -#ifdef _XBOX +#if 0 if (allowOverride) { switch (packId) { case eTUTP_MassEffect: @@ -10350,7 +10350,7 @@ std::wstring CMinecraftApp::getRootPath(std::uint32_t packId, } } -#ifdef _XBOX_ONE +#if 0 void CMinecraftApp::SetReachedMainMenu() { m_hasReachedMainMenu = true; } bool CMinecraftApp::HasReachedMainMenu() { return m_hasReachedMainMenu; } diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index cd84011ad..253a5b8ac 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -10,7 +10,7 @@ #endif #include "Tutorial/TutorialEnum.h" -#ifdef _XBOX +#if 0 #include "XUI/XUI_Helper.h" #include "XUI/XUI_HelpCredits.h" #endif @@ -61,7 +61,7 @@ class Merchant; class CMinecraftAudio; class CMinecraftApp -#ifdef _XBOX +#if 0 : public CXuiModule #endif { @@ -276,7 +276,7 @@ public: // debug -0 show safe area void ShowSafeArea(bool show) { -#ifdef _XBOX +#if 0 CXuiSceneBase::ShowSafeArea(show); #endif } @@ -290,8 +290,8 @@ public: const unsigned short usVersion, const int iPad); -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) std::wstring toStringOptionsStatus( const C4JStorage::eOptionsCallback& eStatus); static int DefaultOptionsCallback(void* pParam, @@ -299,7 +299,7 @@ public: const int iPad); int SetDefaultOptions(C4JStorage::PROFILESETTINGS* pSettings, const int iPad, bool bWriteProfile = true); -#ifdef __ORBIS__ +#if 0 static int OptionsDataCallback(void* pParam, int iPad, unsigned short usVersion, C4JStorage::eOptionsCallback eStatus, @@ -408,13 +408,13 @@ public: static void UpsellReturnedCallback(void* pParam, eUpsellType type, eUpsellResponse result, int iUserData); -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 static int NowDisplayFullVersionPurchase(void* pParam, bool bContinue, int iPad); static int MustSignInFullVersionPurchaseReturned( void* pParam, int iPad, C4JStorage::EMessageResult result); #endif -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 static int MustSignInFullVersionPurchaseReturnedExitTrial( void* pParam, int iPad, C4JStorage::EMessageResult result); #endif @@ -486,7 +486,7 @@ public: bool IsFileInTPD(int iConfig); void GetTPD(int iConfig, std::uint8_t** ppbData, unsigned int* pByteCount); int GetTPDSize() { return m_MEM_TPD.size(); } -#ifndef __PS3__ +#if 1 int GetTPConfigVal(WCHAR* pwchDataFile); #endif @@ -505,7 +505,7 @@ public: private: PlayerUID m_xuidNotch; -#ifdef _DURANGO +#if 0 std::unordered_map m_GTS_Files; #else std::unordered_map m_GTS_Files; @@ -535,7 +535,7 @@ public: void InvalidateBannedList(int iPad); void SetUniqueMapName(char* pszUniqueMapName); char* GetUniqueMapName(void); -#ifdef _XBOX_ONE +#if 0 void AddLevelToBannedLevelList(int iPad, PBANNEDLISTDATA pBannedListData, bool bWriteToTMS); #endif @@ -733,14 +733,14 @@ public: MOJANG_DATA* GetMojangDataForXuid(PlayerUID xuid); static HRESULT RegisterConfigValues(WCHAR* pType, int iValue); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 HRESULT RegisterDLCData(char* pchDLCName, unsigned int uiSortIndex, char* pchImageURL); bool GetDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, ULONGLONG* pullVal); DLC_INFO* GetDLCInfoForTrialOfferID(ULONGLONG ullOfferID_Trial); DLC_INFO* GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full); -#elif defined(_XBOX_ONE) +#elif 0 static HRESULT RegisterDLCData(eDLCContentType, WCHAR*, WCHAR*, WCHAR*, WCHAR*, int, unsigned int); // bool GetDLCFullOfferIDForSkinID(const std::wstring &FirstSkin,WCHAR @@ -781,7 +781,7 @@ public: private: std::vector vDLCCredits; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 static std::unordered_map MojangData; static std::unordered_map @@ -789,7 +789,7 @@ private: static std::unordered_map DLCInfo; static std::unordered_map DLCInfo_SkinName; // skin name, full offer id -#elif defined(_DURANGO) +#elif 0 static std::unordered_map MojangData; static std::unordered_map @@ -962,7 +962,7 @@ public: unsigned int AddTMSPPFileTypeRequest(eDLCContentType eType, bool bPromote = false); int GetDLCInfoTexturesOffersCount(); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 DLC_INFO* GetDLCInfo(int iIndex); DLC_INFO* GetDLCInfo(char*); DLC_INFO* GetDLCInfoFromTPackID(int iTPID); @@ -971,7 +971,7 @@ public: int GetDLCInfoCount(); #else -#ifdef _XBOX_ONE +#if 0 static int TMSPPFileReturned(void* pParam, int iPad, int iUserData, void*, WCHAR* wchFilename); std::unordered_map* GetDLCInfo(); @@ -985,7 +985,7 @@ public: int GetDLCInfoTrialOffersCount(); int GetDLCInfoFullOffersCount(); -#ifdef _XBOX_ONE +#if 0 bool GetDLCFullOfferIDForPackID(const int iPackID, std::wstring& wsProductId); std::wstring GetDLCInfoTexturesFullOffer(int iIndex); @@ -1099,15 +1099,15 @@ private: bool m_bResetNether; std::uint32_t m_dwRequiredTexturePackID; -#ifdef _XBOX_ONE +#if 0 std::vector m_vTMSPPData; #endif -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) C4JStorage::eOptionsCallback m_eOptionsStatusA[XUSER_MAX_COUNT]; -#ifdef __ORBIS__ +#if 0 int m_eOptionsBlocksRequiredA[XUSER_MAX_COUNT]; #endif #endif @@ -1133,13 +1133,13 @@ private: bool bAddDataFolder, std::wstring mountPoint); public: -#ifdef _XBOX +#if 0 // bool m_bTransferSavesToXboxOne; // unsigned int m_uiTransferSlotC; -#elif defined(__PS3__) +#elif 0 -#elif defined _DURANGO +#elif 0 #elif defined _WINDOWS64 // CMinecraftAudio audio; @@ -1147,7 +1147,7 @@ public: #endif -#ifdef _XBOX_ONE +#if 0 public: void SetReachedMainMenu(); bool HasReachedMainMenu(); diff --git a/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp index 8ce5041ce..892b09171 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp @@ -4,7 +4,7 @@ #include #include "DLCManager.h" #include "DLCAudioFile.h" -#if defined _XBOX || defined _WINDOWS64 +#if 0 || defined _WINDOWS64 #include "../../Minecraft.Client/Platform/Common/XML/ATGXmlParser.h" #include "../../Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h" #endif diff --git a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp index f21c0f9c5..7c4dfdd36 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp @@ -80,7 +80,7 @@ std::wstring getMountedDlcReadPath(const std::string& path) { if (!mountedPath.empty()) { readPath = convStringToWstring(mountedPath); } -#elif defined(_DURANGO) +#elif 0 const std::wstring mountedPath = StorageManager.GetMountedPath(readPath.c_str()); if (!mountedPath.empty()) { @@ -235,7 +235,7 @@ DLCPack* DLCManager::getPack(const std::wstring& name) { return pack; } -#ifdef _XBOX_ONE +#if 0 DLCPack* DLCManager::getPackFromProductID(const std::wstring& productID) { DLCPack* pack = NULL; // DWORD currentIndex = 0; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCManager.h b/Minecraft.Client/Platform/Common/DLC/DLCManager.h index 4552c7b8a..83a05309d 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCManager.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCManager.h @@ -77,7 +77,7 @@ public: void LanguageChanged(void); DLCPack* getPack(const std::wstring& name); -#ifdef _XBOX_ONE +#if 0 DLCPack* DLCManager::getPackFromProductID(const std::wstring& productID); #endif DLCPack* getPack(unsigned int index, EDLCType type = e_DLCType_All); diff --git a/Minecraft.Client/Platform/Common/DLC/DLCPack.cpp b/Minecraft.Client/Platform/Common/DLC/DLCPack.cpp index 81d3ab80d..58b677f93 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCPack.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCPack.cpp @@ -15,7 +15,7 @@ DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { m_dataPath = L""; m_packName = name; m_dwLicenseMask = dwLicenseMask; -#ifdef _XBOX_ONE +#if 0 m_wsProductId = L""; #else m_ullFullOfferId = 0LL; @@ -25,7 +25,7 @@ DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { m_packVersion = 0; m_parentPack = NULL; m_dlcMountIndex = -1; -#ifdef _XBOX +#if 0 m_dlcDeviceID = XCONTENTDEVICE_ANY; #endif @@ -34,7 +34,7 @@ DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { m_data = NULL; } -#ifdef _XBOX_ONE +#if 0 DLCPack::DLCPack(const std::wstring& name, const std::wstring& productID, std::uint32_t dwLicenseMask) { m_dataPath = L""; @@ -176,7 +176,7 @@ DLCFile* DLCPack::addFile(DLCManager::EDLCType type, const std::wstring& path) { newFile = new DLCSkinFile(strippedPath); // check to see if we can get the full offer id using this skin name -#ifdef _XBOX_ONE +#if 0 app.GetDLCFullOfferIDForSkinID(strippedPath, m_wsProductId); #else ULONGLONG ullVal = 0LL; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCPack.h b/Minecraft.Client/Platform/Common/DLC/DLCPack.h index 1408c440b..fe05ea580 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCPack.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCPack.h @@ -19,7 +19,7 @@ private: std::uint32_t m_dwLicenseMask; int m_dlcMountIndex; XCONTENTDEVICEID m_dlcDeviceID; -#ifdef _XBOX_ONE +#if 0 std::wstring m_wsProductId; #else ULONGLONG m_ullFullOfferId; @@ -33,7 +33,7 @@ private: // deleting it invalidates ALL of it's children. public: DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask); -#ifdef _XBOX_ONE +#if 0 DLCPack(const std::wstring& name, const std::wstring& productID, std::uint32_t dwLicenseMask); #endif @@ -76,7 +76,7 @@ public: std::wstring getName() { return m_packName; } void UpdateLanguage(); -#ifdef _XBOX_ONE +#if 0 std::wstring getPurchaseOfferId() { return m_wsProductId; } #else ULONGLONG getPurchaseOfferId() { return m_ullFullOfferId; } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp index da9e7df83..a792b30da 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp @@ -107,7 +107,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, SKIN_BOX* pSkinBox = new SKIN_BOX; ZeroMemory(pSkinBox, sizeof(SKIN_BOX)); -#ifdef __PS3__ +#if 0 // 4J Stu - The Xbox version used swscanf_s which isn't available in // GCC. swscanf(value.c_str(), L"%10ls%f%f%f%f%f%f%f%f", wchBodyPart, @@ -136,7 +136,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, m_AdditionalBoxes.push_back(pSkinBox); } break; case DLCManager::e_DLCParamType_Anim: { -#ifdef __PS3__ +#if 0 // 4J Stu - The Xbox version used swscanf_s which isn't available in // GCC. swscanf(value.c_str(), L"%X", &m_uiAnimOverrideBitmask); diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp index 928fb1672..4c37de5d2 100644 --- a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp @@ -627,7 +627,7 @@ void GameRuleManager::processSchematicsLighting(LevelChunk* levelChunk) { } void GameRuleManager::loadDefaultGameRules() { -#ifdef _XBOX +#if 0 #ifdef _TU_BUILD std::wstring fileRoot = L"UPDATE:\\res\\GameRules\\Tutorial.pck"; #else @@ -654,18 +654,18 @@ void GameRuleManager::loadDefaultGameRules() { // delete packFiles; #endif -#else // _XBOX +#else // 0 #ifndef __linux__ #ifdef _WINDOWS64 File packedTutorialFile(L"Windows64Media\\Tutorial\\Tutorial.pck"); if (!packedTutorialFile.exists()) packedTutorialFile = File(L"Windows64\\Tutorial\\Tutorial.pck"); -#elif defined(__ORBIS__) +#elif 0 File packedTutorialFile(L"/app0/orbis/Tutorial/Tutorial.pck"); -#elif defined(__PSVITA__) +#elif 0 File packedTutorialFile(L"PSVita/Tutorial/Tutorial.pck"); -#elif defined(__PS3__) +#elif 0 File packedTutorialFile(L"PS3/Tutorial/Tutorial.pck"); #else File packedTutorialFile(L"Tutorial\\Tutorial.pck"); diff --git a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp index 8e2260a11..ea914a45f 100644 --- a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp @@ -468,7 +468,7 @@ void LevelGenerationOptions::loadBaseSaveData() { mountIndex = m_parentDLCPack->GetDLCMountIndex(); if (mountIndex > -1) { -#ifdef _DURANGO +#if 0 if (StorageManager.MountInstalledDLC( ProfileManager.GetPrimaryPad(), mountIndex, &LevelGenerationOptions::packMounted, this, @@ -624,7 +624,7 @@ int LevelGenerationOptions::packMounted(LPVOID pParam, int iPad, DWORD dwErr, } } } -#ifdef _DURANGO +#if 0 DWORD result = StorageManager.UnmountInstalledDLC(L"WPACK"); #else DWORD result = StorageManager.UnmountInstalledDLC("WPACK"); diff --git a/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.cpp index 6afee4421..7cdef6114 100644 --- a/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.cpp +++ b/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.cpp @@ -73,7 +73,7 @@ bool LeaderboardManager::ReadStats_TopRank(LeaderboardReadListener *listener, in return true; } -#ifndef _XBOX +#if 1 void LeaderboardManager::printStats(ReadView &view) { app.DebugPrintf("[LeaderboardManager] Printing stats:\n" diff --git a/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.h b/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.h index 5dde22f38..dc8a363e9 100644 --- a/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.h +++ b/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.h @@ -133,7 +133,7 @@ public: public: -#ifdef _XBOX +#if 0 typedef XSESSION_VIEW_PROPERTIES *ViewIn; typedef PXUSER_STATS_READ_RESULTS ViewOut; #else @@ -243,7 +243,7 @@ public: virtual bool isIdle() = 0; public: -#ifndef _XBOX +#if 1 static void printStats(ReadView &view); #endif }; @@ -251,14 +251,14 @@ public: class LeaderboardReadListener { public: -#ifdef _XBOX +#if 0 virtual bool OnStatsReadComplete(bool success, int numResults, LeaderboardManager::ViewOut results) = 0; #else virtual bool OnStatsReadComplete(LeaderboardManager::eStatsReturn ret, int numResults, LeaderboardManager::ViewOut results) = 0; #endif }; -#ifndef _XBOX +#if 1 class DebugReadListener : public LeaderboardReadListener { public: diff --git a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp index 88a4077d9..647765570 100644 --- a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp +++ b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp @@ -13,13 +13,13 @@ #include "../../../../Minecraft.World/Util/StringHelpers.h" -#ifdef __ORBIS__ +#if 0 #include "Orbis/OrbisExtras/ShutdownManager.h" #include "Orbis/Orbis_App.h" -#elif defined __PSVITA__ +#elif 0 #include "PSVita/PSVitaExtras/ShutdownManager.h" #include "PSVita/PSVita_App.h" -#elif defined __PS3__ +#elif 0 #include "PS3/PS3Extras/ShutdownManager.h" #include "PS3/PS3_App.h" #else @@ -194,7 +194,7 @@ HRESULT SonyLeaderboardManager::fillByIdsQuery(const SceNpId& myNpId, switch (m_eFilterMode) { case eFM_Friends: { // 4J-JEV: Implementation for Orbis & Vita as they a very similar. -#if (defined __ORBIS__) || (defined __PSVITA__) +#if (0) || (0) sce::Toolkit::NP::Utilities::Future s_friendList; @@ -238,7 +238,7 @@ HRESULT SonyLeaderboardManager::fillByIdsQuery(const SceNpId& myNpId, npIds[0] = myNpId; } -#elif (defined __PS3__) +#elif (0) // PS3 // 4J-JEV: Doesn't include the player (its just their friends). @@ -295,7 +295,7 @@ bool SonyLeaderboardManager::getScoreByIds() { ProfileManager.GetSceNpId(0, &myNpId); ret = fillByIdsQuery(myNpId, npIds, num); -#ifdef __PS3__ +#if 0 if (ret < 0) goto error2; #endif @@ -316,7 +316,7 @@ bool SonyLeaderboardManager::getScoreByIds() { int boardId = getBoardId(m_difficulty, m_statsType); // 4J-JEV: Orbis can only do with 100 ids max, so we use batches. -#ifdef __ORBIS__ +#if 0 for (int batch = 0; batch < num; batch += 100) { #endif ret = createTransactionContext(m_titleContext); @@ -352,7 +352,7 @@ bool SonyLeaderboardManager::getScoreByIds() { m_requestId = ret; } -#ifdef __ORBIS__ +#if 0 int tmpNum = std::min(num - batch, (unsigned int)100); app.DebugPrintf( "[SonyLeaderboardManager]\t Requesting ids %i-%i of %i.\n", batch, @@ -364,7 +364,7 @@ bool SonyLeaderboardManager::getScoreByIds() { m_requestId, boardId, // BoardId -#ifdef __ORBIS__ +#if 0 batch + npIds, sizeof(SceNpId) * tmpNum, // IN: Player IDs batch + ptr, sizeof(SceNpScorePlayerRankData) * tmpNum, // OUT: Rank Data @@ -407,7 +407,7 @@ bool SonyLeaderboardManager::getScoreByIds() { destroyTransactionContext(m_requestId); m_requestId = 0; -#ifdef __ORBIS__ +#if 0 } #endif @@ -640,7 +640,7 @@ bool SonyLeaderboardManager::setScore() { &tmp, // OUT: current rank, -#ifndef __PS3__ +#if 1 NULL, // compareDate #endif diff --git a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h index 79e7ecf3c..fa8ad7817 100644 --- a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h +++ b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h @@ -2,7 +2,7 @@ #include "Common/Leaderboards/LeaderboardManager.h" -#ifdef __PS3__ +#if 0 typedef CellRtcTick SonyRtcTick; #else typedef SceRtcTick SonyRtcTick; @@ -135,7 +135,7 @@ protected: virtual HRESULT fillByIdsQuery(const SceNpId& myNpId, SceNpId*& npIds, uint32_t& len); -#if (defined __ORBIS__) || (defined __PSVITA__) +#if (0) || (0) virtual HRESULT getFriendsList( sce::Toolkit::NP::Utilities::Future& friendsList) = 0; diff --git a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp index 73cbc9cf0..81599bc5e 100644 --- a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp @@ -28,12 +28,12 @@ #include "../GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" -#if !(defined __PSVITA__) +#if !(0) #include "../UI/UI.h" #include "../UI/UIScene_PauseMenu.h" #endif -#ifdef _DURANGO +#if 0 #include "../../Minecraft.World/Stats/DurangoStats.h" #endif @@ -72,7 +72,7 @@ void CGameNetworkManager::Terminate() { } void CGameNetworkManager::DoWork() { -#ifdef _XBOX +#if 0 // did we get any notifications from the game listener? if (app.GetNotifications()->size() != 0) { PNOTIFICATION pNotification = app.GetNotifications()->back(); @@ -141,7 +141,7 @@ bool CGameNetworkManager::_RunNetworkGame(void* lpParameter) { bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, void* lpParameter) { -#ifdef _DURANGO +#if 0 ProfileManager.SetDeferredSignoutEnabled(true); #endif @@ -165,7 +165,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, // Load the tutorial save data here if (param->levelGen->requiresBaseSave() && !param->levelGen->getBaseSavePath().empty()) { -#ifdef _XBOX +#if 0 #ifdef _TU_BUILD std::wstring fileRoot = L"UPDATE:\\res\\GameRules\\" + @@ -184,15 +184,15 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, if (!root.exists()) fileRoot = L"Windows64\\Tutorial\\" + param->levelGen->getBaseSavePath(); -#elif defined(__ORBIS__) +#elif 0 std::wstring fileRoot = L"/app0/orbis/Tutorial/" + param->levelGen->getBaseSavePath(); -#elif defined(__PSVITA__) +#elif 0 std::wstring fileRoot = L"PSVita/Tutorial/" + param->levelGen->getBaseSavePath(); -#elif defined(__PS3__) +#elif 0 std::wstring fileRoot = L"PS3/Tutorial/" + param->levelGen->getBaseSavePath(); @@ -272,9 +272,9 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, C4JThread* thread = new C4JThread(&CGameNetworkManager::ServerThreadProc, lpParameter, "Server", 256 * 1024); -#if defined __PS3__ || defined __PSVITA__ +#if 0 || 0 thread->SetPriority(THREAD_PRIORITY_BELOW_NORMAL); -#endif //__PS3__ +#endif //0 thread->SetProcessor(CPU_CORE_SERVER); thread->Run(); @@ -292,7 +292,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, Socket::Initialise(NULL); } -#ifndef _XBOX +#if 1 Minecraft* pMinecraft = Minecraft::GetInstance(); app.DebugPrintf("[NET] IsReadyToPlayOrIdle=%d IsInSession=%d\n", IsReadyToPlayOrIdle(), IsInSession()); @@ -518,7 +518,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, !connection->isClosed(), ProfileManager.IsSignedIn(idx), !g_NetworkManager.IsLeavingGame()); -#if defined _XBOX || __PS3__ +#if 0 || 0 } while (IsInSession() && !connection->isStarted() && !connection->isClosed() && ProfileManager.IsSignedIn(idx) && @@ -619,7 +619,7 @@ INetworkPlayer* CGameNetworkManager::GetPlayerBySmallId(unsigned char smallId) { return s_pPlatformNetworkManager->GetPlayerBySmallId(smallId); } -#ifdef _DURANGO +#if 0 std::wstring CGameNetworkManager::GetDisplayNameByGamertag( std::wstring gamertag) { return s_pPlatformNetworkManager->GetDisplayNameByGamertag(gamertag); @@ -763,7 +763,7 @@ CGameNetworkManager::eJoinGameResult CGameNetworkManager::JoinGame( } void CGameNetworkManager::CancelJoinGame(void* lpParam) { -#ifdef _XBOX_ONE +#if 0 s_pPlatformNetworkManager->CancelJoinGame(); #endif } @@ -779,7 +779,7 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void* pParam, INVITE_INFO* pInviteInfo = (INVITE_INFO*)pParam; if (bContinue == true) { -#ifdef __ORBIS__ +#if 0 // Check if PSN is unavailable because of age restriction int npAvailability = ProfileManager.getNPAvailability(iPad); if (npAvailability == SCE_NP_ERROR_AGE_RESTRICTION) { @@ -814,10 +814,10 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void* pParam, // Check if user-created content is allowed, as we cannot play // multiplayer if it's not bool noUGC = false; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 ProfileManager.GetChatAndContentRestrictions(iPad, false, &noUGC, NULL, NULL); -#elif defined(__ORBIS__) +#elif 0 ProfileManager.GetChatAndContentRestrictions(iPad, false, NULL, &noUGC, NULL); #endif @@ -838,7 +838,7 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void* pParam, uiIDA, 1, ProfileManager.GetPrimaryPad()); } else { -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 bool chatRestricted = false; ProfileManager.GetChatAndContentRestrictions( iPad, false, &chatRestricted, NULL, NULL); @@ -939,7 +939,7 @@ int CGameNetworkManager::RunNetworkGameThreadProc(void* lpParameter) { return -1; } -#ifdef __PSVITA__ +#if 0 // 4J-JEV: Wait for the loading/saving to finish. while (StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle) Sleep(10); @@ -1010,7 +1010,7 @@ int CGameNetworkManager::ExitAndJoinFromInviteThreadProc(void* lpParam) { // Xbox should always be online when receiving invites - on PS3 we need to // check & ask the user to sign in -#if !defined(__PS3__) && !defined(__PSVITA__) +#if !0 && !0 JoinFromInviteData* inviteData = (JoinFromInviteData*)lpParam; app.SetAction(inviteData->dwUserIndex, eAppAction_JoinFromInvite, lpParam); #else @@ -1032,7 +1032,7 @@ int CGameNetworkManager::ExitAndJoinFromInviteThreadProc(void* lpParam) { return S_OK; } -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 // This case happens when we have been returned from the game to the main menu // after receiving an invite and are now trying to go back in to join the new // game The pair of methods MustSignInReturned_0 & PSNSignInReturned_0 handle @@ -1040,13 +1040,13 @@ int CGameNetworkManager::ExitAndJoinFromInviteThreadProc(void* lpParam) { int CGameNetworkManager::MustSignInReturned_0( void* pParam, int iPad, C4JStorage::EMessageResult result) { if (result == C4JStorage::EMessage_ResultAccept) { -#ifdef __PS3__ +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn( &CGameNetworkManager::PSNSignInReturned_0, pParam, true); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::AttemptPSNSignIn( &CGameNetworkManager::PSNSignInReturned_0, pParam, true); -#elif defined __ORBIS__ +#elif 0 SQRNetworkManager_Orbis::AttemptPSNSignIn( &CGameNetworkManager::PSNSignInReturned_0, pParam, true); #endif @@ -1069,13 +1069,13 @@ int CGameNetworkManager::PSNSignInReturned_0(void* pParam, bool bContinue, if (bContinue) { if (inviteData->pInviteInfo->netVersion == 0) { -#if defined __PS3__ || defined __VITA__ +#if 0 || defined __VITA__ if (!SQRNetworkManager_PS3::UpdateInviteData( (SQRNetworkManager::PresenceSyncInfo*) inviteData->pInviteInfo)) { bContinue = false; } -#elif defined __ORBIS__ +#elif 0 // TODO: No Orbis equivalent (should there be?) #endif } @@ -1100,13 +1100,13 @@ int CGameNetworkManager::PSNSignInReturned_0(void* pParam, bool bContinue, int CGameNetworkManager::MustSignInReturned_1( void* pParam, int iPad, C4JStorage::EMessageResult result) { if (result == C4JStorage::EMessage_ResultAccept) { -#ifdef __PS3__ +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn( &CGameNetworkManager::PSNSignInReturned_1, pParam, true); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::AttemptPSNSignIn( &CGameNetworkManager::PSNSignInReturned_1, pParam, true); -#elif defined __ORBIS__ +#elif 0 SQRNetworkManager_Orbis::AttemptPSNSignIn( &CGameNetworkManager::PSNSignInReturned_1, pParam, true); #endif @@ -1124,12 +1124,12 @@ int CGameNetworkManager::PSNSignInReturned_1(void* pParam, bool bContinue, if (bContinue) { if (inviteInfo->netVersion == 0) { -#if defined __PS3__ || defined __VITA__ +#if 0 || defined __VITA__ if (!SQRNetworkManager_PS3::UpdateInviteData( (SQRNetworkManager::PresenceSyncInfo*)inviteInfo)) { bContinue = false; } -#elif defined __ORBIS__ +#elif 0 // TODO: No Orbis equivalent (should there be?) #endif } @@ -1157,7 +1157,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { Minecraft* pMinecraft = Minecraft::GetInstance(); MinecraftServer* pServer = MinecraftServer::getInstance(); -#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ +#if 0 || 0 || 0 unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; if (g_NetworkManager.m_bLastDisconnectWasLostRoomOnly) { @@ -1184,7 +1184,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { pMinecraft->progressRenderer->progressStage( -1); // g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT) // ); -#elif defined(_XBOX_ONE) +#elif 0 if (g_NetworkManager.m_bFullSessionMessageOnNextSessionChange) { unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -1219,14 +1219,14 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { // wait for the server to be in a non-ticking state pServer->m_serverPausedEvent->WaitForSignal(INFINITE); -#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ +#if 0 || 0 || 0 // Swap these two messages around as one is too long to display at 480 pMinecraft->progressRenderer->progressStartNoAbort( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME); pMinecraft->progressRenderer->progressStage( -1); // g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT) // ); -#elif defined(_XBOX_ONE) +#elif 0 if (g_NetworkManager.m_bFullSessionMessageOnNextSessionChange) { pMinecraft->progressRenderer->progressStartNoAbort( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME); @@ -1246,7 +1246,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { pMinecraft->progressRenderer->progressStagePercentage(25); -#ifdef _XBOX_ONE +#if 0 // wait for any players that were being added, to finish doing this. On XB1, // if we don't do this then there's an async thread running doing this, // which could then finish at any inappropriate time later @@ -1348,7 +1348,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { DisconnectPacket:: eDisconnect_ConnectionCreationFailed)) { pMinecraft->removeLocalPlayerIdx(index); -#ifdef _XBOX_ONE +#if 0 ProfileManager.RemoveGamepadFromGame(index); #endif } @@ -1358,7 +1358,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { pMinecraft->progressRenderer->progressStagePercentage(100); -#ifndef _XBOX +#if 1 // Make sure that we have transitioned through any joining/creating stages // so we're actually ready to set to play while (!s_pPlatformNetworkManager->IsReadyToPlayOrIdle()) { @@ -1368,7 +1368,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { s_pPlatformNetworkManager->_StartGame(); -#ifndef _XBOX +#if 1 // Wait until the message box has been closed while (ui.IsSceneInStack(XUSER_INDEX_ANY, eUIScene_MessageBox)) { Sleep(10); @@ -1400,7 +1400,7 @@ std::wstring CGameNetworkManager::GatherStats() { } void CGameNetworkManager::renderQueueMeter() { -#ifdef _XBOX +#if 0 int height = 720; CGameNetworkManager::byteQueue[(CGameNetworkManager::messageQueuePos) & @@ -1469,7 +1469,7 @@ void CGameNetworkManager::StateChange_JoiningToIdle( } void CGameNetworkManager::StateChange_AnyToStarting() { -#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 || 0 app.getRemoteStorage()->shutdown(); // shut the remote storage lib down and // hopefully get our 7mb back #endif @@ -1634,7 +1634,7 @@ void CGameNetworkManager::PlayerJoining(INetworkPlayer* pNetworkPlayer) { TelemetryManager->RecordPlayerSessionStart( pNetworkPlayer->GetUserIndex()); } -#ifdef _XBOX +#if 0 else { if (!pNetworkPlayer->IsHost()) { for (int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { @@ -1660,7 +1660,7 @@ void CGameNetworkManager::PlayerLeaving(INetworkPlayer* pNetworkPlayer) { TelemetryManager->RecordPlayerSessionExit( pNetworkPlayer->GetUserIndex(), app.GetDisconnectReason()); } -#ifdef _XBOX +#if 0 else { for (int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { if (Minecraft::GetInstance()->localplayers[idx] != NULL) { @@ -1714,7 +1714,7 @@ void CGameNetworkManager::GameInviteReceived(int userIndex, bool bContentRestricted = false; bool pccAllowed = true; bool pccFriendsAllowed = true; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 ProfileManager.GetChatAndContentRestrictions(userIndex, false, &noUGC, &bContentRestricted, NULL); #else @@ -1723,7 +1723,7 @@ void CGameNetworkManager::GameInviteReceived(int userIndex, if (!pccAllowed && !pccFriendsAllowed) noUGC = true; #endif -#if defined(_XBOX) || defined(__PS3__) +#if 0 || 0 if (joiningUsers > 1 && !RenderManager.IsHiDef() && userIndex != ProfileManager.GetPrimaryPad()) { unsigned int uiIDA[1]; @@ -1738,7 +1738,7 @@ void CGameNetworkManager::GameInviteReceived(int userIndex, #endif if (noUGC) { -#ifdef __PSVITA__ +#if 0 // showing the system message for chat restriction here instead now, to // fix FQA bug report ProfileManager.DisplaySystemMessage( @@ -1753,7 +1753,7 @@ void CGameNetworkManager::GameInviteReceived(int userIndex, XUSER_INDEX_ANY); #endif } -#if defined(__PS3__) || defined __PSVITA__ +#if 0 || 0 else if (bContentRestricted) { int messageText = IDS_CONTENT_RESTRICTION; if (joiningUsers > 1) messageText = IDS_CONTENT_RESTRICTION_MULTIPLAYER; @@ -1776,7 +1776,7 @@ void CGameNetworkManager::GameInviteReceived(int userIndex, IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA, 1, XUSER_INDEX_ANY); } else { -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 bool chatRestricted = false; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), false, &chatRestricted, NULL, NULL); @@ -1787,7 +1787,7 @@ void CGameNetworkManager::GameInviteReceived(int userIndex, } #endif if (!g_NetworkManager.IsInSession()) { -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 // PS3 is more complicated here - we need to make sure that the // player is online. If they are then we can do the same as the // xbox, if not we need to try and get them online and then, if they @@ -1823,7 +1823,7 @@ void CGameNetworkManager::GameInviteReceived(int userIndex, // pInviteInfo; // tell the app to process this -#ifdef __PSVITA__ +#if 0 if (((CPlatformNetworkManagerSony*)s_pPlatformNetworkManager) ->checkValidInviteData(pInviteInfo)) #endif @@ -1854,7 +1854,7 @@ void CGameNetworkManager::HandleInviteWhenInMenus( app.SetAction(userIndex, eAppAction_DashboardTrialJoinFromInvite); } else { -#ifndef _XBOX_ONE +#if 1 ProfileManager.SetPrimaryPad(userIndex); #endif @@ -1870,7 +1870,7 @@ void CGameNetworkManager::HandleInviteWhenInMenus( // as the main player might sign out in the sign-in ui // ProfileManager.SetLockedProfile(-1); -#ifdef _XBOX_ONE +#if 0 if ((!app.IsLocalMultiplayerAvailable()) && InputManager.IsPadLocked(userIndex)) #else @@ -1917,7 +1917,7 @@ void CGameNetworkManager::HandleInviteWhenInMenus( } else { // the FromInvite will make the lib decide how many panes to display // based on connected pads/signed in players -#ifdef _XBOX +#if 0 ProfileManager.RequestSignInUI( true, false, false, false, false, &CGameNetworkManager::JoinFromInvite_SignInReturned, @@ -1944,7 +1944,7 @@ void CGameNetworkManager::AddLocalPlayerFailed(int idx, : DisconnectPacket::eDisconnect_ConnectionCreationFailed); } -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 void CGameNetworkManager::HandleDisconnect(bool bLostRoomOnly, bool bPSNSignout) #else void CGameNetworkManager::HandleDisconnect(bool bLostRoomOnly) @@ -1955,7 +1955,7 @@ void CGameNetworkManager::HandleDisconnect(bool bLostRoomOnly) if ((g_NetworkManager.GetLockedProfile() != -1) && iPrimaryPlayer != -1 && g_NetworkManager.IsInSession()) { m_bLastDisconnectWasLostRoomOnly = bLostRoomOnly; -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 m_bSignedOutofPSN = bPSNSignout; #endif app.SetAction(iPrimaryPlayer, eAppAction_EthernetDisconnected); @@ -2040,7 +2040,7 @@ void CGameNetworkManager::ServerStoppedWait() { if (C4JThread::isMainThread()) { int result = WAIT_TIMEOUT; do { -#ifndef _XBOX +#if 1 RenderManager.StartFrame(); #endif result = m_hServerStoppedEvent->WaitForSignal(20); @@ -2077,13 +2077,13 @@ int CGameNetworkManager::GetJoiningReadyPercentage() { return s_pPlatformNetworkManager->GetJoiningReadyPercentage(); } -#ifndef _XBOX +#if 1 void CGameNetworkManager::FakeLocalPlayerJoined() { s_pPlatformNetworkManager->FakeLocalPlayerJoined(); } #endif -#ifdef __PSVITA__ +#if 0 bool CGameNetworkManager::usingAdhocMode() { return ((CPlatformNetworkManagerSony*)s_pPlatformNetworkManager) ->usingAdhocMode(); diff --git a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.h b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.h index 7ad941627..3bf54a02c 100644 --- a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.h +++ b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.h @@ -122,7 +122,7 @@ public: static int ServerThreadProc(void* lpParameter); static int ExitAndJoinFromInviteThreadProc(void* lpParam); -#if (defined __PS3__) || (defined __ORBIS__) || (defined __PSVITA__) +#if (0) || (0) || (0) static int MustSignInReturned_0(void* pParam, int iPad, C4JStorage::EMessageResult result); static int PSNSignInReturned_0(void* pParam, bool bContinue, int iPad); @@ -154,7 +154,7 @@ public: void ServerStoppedDestroy(); // Destroy signal bool ServerStoppedValid(); // Is non-NULL -#ifdef __PSVITA__ +#if 0 static bool usingAdhocMode(); static void setAdhocMode(bool bAdhoc); static void startAdhocMatching(); @@ -192,7 +192,7 @@ private: void GameInviteReceived(int userIndex, const INVITE_INFO* pInviteInfo); void HandleInviteWhenInMenus(int userIndex, const INVITE_INFO* pInviteInfo); void AddLocalPlayerFailed(int idx, bool serverFull = false); -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 void HandleDisconnect(bool bLostRoomOnly, bool bPSNSignOut); #else void HandleDisconnect(bool bLostRoomOnly); @@ -208,7 +208,7 @@ private: C4JThread::Event* m_hServerReadyEvent; bool m_bInitialised; -#ifdef _XBOX_ONE +#if 0 public: void SetFullSessionMessageOnNextSessionChange() { m_bFullSessionMessageOnNextSessionChange = true; @@ -221,12 +221,12 @@ private: int GetJoiningReadyPercentage(); bool m_bLastDisconnectWasLostRoomOnly; bool m_bFullSessionMessageOnNextSessionChange; -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 bool m_bSignedOutofPSN; #endif public: -#ifndef _XBOX +#if 1 void FakeLocalPlayerJoined(); // Temporary method whilst we don't have real // networking to make this happen #endif @@ -234,7 +234,7 @@ public: extern CGameNetworkManager g_NetworkManager; -#ifdef __PS3__ +#if 0 #undef __in #define __out #endif diff --git a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h index 017c993dc..1ec155cd6 100644 --- a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h +++ b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h @@ -138,13 +138,13 @@ public: void* pParam) = 0; virtual void ForceFriendsSessionRefresh() = 0; -#ifndef _XBOX +#if 1 virtual void FakeLocalPlayerJoined() { }; // Temporary method whilst we don't have real networking to make this // happen #endif -#ifdef _DURANGO +#if 0 virtual std::wstring GetDisplayNameByGamertag(std::wstring gamertag) = 0; #endif }; diff --git a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp index afe764a87..929351a85 100644 --- a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp @@ -211,7 +211,7 @@ void CPlatformNetworkManagerStub::HostGame( int localUsersMask, bool bOnlineGame, bool bIsPrivate, unsigned char publicSlots /*= MINECRAFT_NET_MAX_PLAYERS*/, unsigned char privateSlots /*= 0*/) { - // #ifdef _XBOX + // #ifdef 0 // 4J Stu - We probably did this earlier as well, but just to be sure! SetLocalGame(!bOnlineGame); SetPrivateGame(bIsPrivate); diff --git a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h index 1a64cba27..330f6c34f 100644 --- a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h +++ b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h @@ -193,7 +193,7 @@ public: private: void NotifyPlayerJoined(IQNetPlayer* pQNetPlayer); -#ifndef _XBOX +#if 1 void FakeLocalPlayerJoined() { NotifyPlayerJoined(m_pIQNet->GetLocalPlayerByUserIndex(0)); } diff --git a/Minecraft.Client/Platform/Common/Network/SessionInfo.h b/Minecraft.Client/Platform/Common/Network/SessionInfo.h index 0020b4978..2b364e2b7 100644 --- a/Minecraft.Client/Platform/Common/Network/SessionInfo.h +++ b/Minecraft.Client/Platform/Common/Network/SessionInfo.h @@ -1,12 +1,12 @@ #pragma once -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 #include "Sony/SQRNetworkManager.h" #endif // A struct that we store in the QoS data when we are hosting the session. Max // size 1020 bytes. -#ifdef _XBOX +#if 0 typedef struct _GameSessionData { unsigned short netVersion; // 2 bytes char hostName[XUSER_NAME_SIZE]; // 16 bytes ( 16*1 ) @@ -33,7 +33,7 @@ typedef struct _GameSessionData { subTexturePackId = 0; } } GameSessionData; -#elif defined __PS3__ || defined __ORBIS__ || defined(__PSVITA__) +#elif 0 || 0 || 0 typedef struct _GameSessionData { unsigned short netVersion; // 2 bytes GameSessionUID hostPlayerUID; // 8 bytes ( 8*1 ) on xbox, 24 bytes on PS3 @@ -81,11 +81,11 @@ typedef struct _GameSessionData { class FriendSessionInfo { public: SessionID sessionId; -#ifdef _XBOX +#if 0 XSESSION_SEARCHRESULT searchResult; -#elif defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#elif 0 || 0 || 0 SQRNetworkManager::SessionSearchResult searchResult; -#elif defined(_DURANGO) +#elif 0 DQRNetworkManager::SessionSearchResult searchResult; #endif wchar_t* displayLabel; diff --git a/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp index b89193002..48a5daf2e 100644 --- a/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp +++ b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp @@ -8,7 +8,7 @@ #include "TelemetryManager.h" -#if !defined(_DURANGO) && !defined(_XBOX) +#if !0 && !0 CTelemetryManager *TelemetryManager = new CTelemetryManager(); @@ -286,7 +286,7 @@ int CTelemetryManager::GetMultiplayerInstanceID() int CTelemetryManager::GenerateMultiplayerInstanceId() { -#if defined(_DURANGO) || defined(_XBOX) +#if 0 || 0 FILETIME SystemTimeAsFileTime; GetSystemTimeAsFileTime( &SystemTimeAsFileTime ); return static_cast(SystemTimeAsFileTime.dwLowDateTime); diff --git a/Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp b/Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp index 85c54405b..be859c20f 100644 --- a/Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp +++ b/Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp @@ -38,7 +38,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) e_Tutorial_Completion_Jump_To_Last_Task, eTelemetryTutorial_TrialStart)); } else { -#ifdef _XBOX +#if 0 if (getCompleted(eTutorial_Telemetry_Halfway) && !isStateCompleted(e_Tutorial_State_Redstone_And_Piston)) { addTask(e_Tutorial_State_Gameplay, diff --git a/Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp index fe45db1fb..23752eda7 100644 --- a/Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp +++ b/Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp @@ -378,7 +378,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { m_CurrentState = e_Tutorial_State_Gameplay; m_hasStateChanged = false; -#ifdef _XBOX +#if 0 m_hTutorialScene = NULL; #endif @@ -1956,8 +1956,8 @@ Tutorial::~Tutorial() { } void Tutorial::debugResetPlayerSavedProgress(int iPad) { -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)StorageManager.GetGameDefinedProfileData(iPad); #else @@ -1987,8 +1987,8 @@ void Tutorial::setCompleted(int completableId) { if (completableIndex >= 0 && completableIndex < TUTORIAL_PROFILE_STORAGE_BITS) { // Set the bit for this position -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)StorageManager.GetGameDefinedProfileData(m_iPad); #else @@ -2022,8 +2022,8 @@ bool Tutorial::getCompleted(int completableId) { completableIndex < TUTORIAL_PROFILE_STORAGE_BITS) { // Read the bit for this position // Retrieve the data pointer from the profile -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)StorageManager.GetGameDefinedProfileData(m_iPad); #else @@ -2147,7 +2147,7 @@ void Tutorial::tick() { } if (!hasRequestedUI) { -#ifdef _XBOX +#if 0 m_bSceneIsSplitscreen = app.GetLocalPlayerCount() > 1; if (m_bSceneIsSplitscreen) { app.NavigateToScene(m_iPad, eUIComponent_TutorialPopup, (void*)this, @@ -2163,7 +2163,7 @@ void Tutorial::tick() { } else { // if we've changed mode, we may need to change scene if (m_bSceneIsSplitscreen != (app.GetLocalPlayerCount() > 1)) { -#ifdef _XBOX +#if 0 app.TutorialSceneNavigateBack(m_iPad); m_bSceneIsSplitscreen = app.GetLocalPlayerCount() > 1; if (m_bSceneIsSplitscreen) { @@ -2979,7 +2979,7 @@ void Tutorial::addMessage( new TutorialMessage(messageId, limitRepeats, numRepeats); } -#ifdef _XBOX +#if 0 void Tutorial::changeTutorialState(eTutorial_State newState, CXuiScene* scene /*= NULL*/) #else @@ -2990,7 +2990,7 @@ void Tutorial::changeTutorialState(eTutorial_State newState, if (newState == m_CurrentState) { // If clearing the scene, make sure that the tutorial popup has its // reference to this scene removed -#ifndef _XBOX +#if 1 if (scene == NULL) { ui.RemoveInteractSceneReference(m_iPad, m_UIScene); } @@ -3037,7 +3037,7 @@ void Tutorial::changeTutorialState(eTutorial_State newState, // If clearing the scene, make sure that the tutorial popup has its // reference to this scene removed -#ifndef _XBOX +#if 1 if (scene == NULL) { ui.RemoveInteractSceneReference(m_iPad, m_UIScene); } diff --git a/Minecraft.Client/Platform/Common/Tutorial/Tutorial.h b/Minecraft.Client/Platform/Common/Tutorial/Tutorial.h index 2cef6e98b..126c899d9 100644 --- a/Minecraft.Client/Platform/Common/Tutorial/Tutorial.h +++ b/Minecraft.Client/Platform/Common/Tutorial/Tutorial.h @@ -67,7 +67,7 @@ private: static int m_iTutorialFreezeTimeValue; eTutorial_State m_CurrentState; bool m_hasStateChanged; -#ifdef _XBOX +#if 0 HXUIOBJ m_hTutorialScene; // to store the popup scene (splitscreen or normal) #endif @@ -113,7 +113,7 @@ private: bool hasRequestedUI; bool uiTempDisabled; -#ifdef _XBOX +#if 0 CXuiScene* m_UIScene; #else UIScene* m_UIScene; @@ -143,7 +143,7 @@ public: void setCompleted(int completableId); bool getCompleted(int completableId); -#ifdef _XBOX +#if 0 void changeTutorialState(eTutorial_State newState, CXuiScene* scene = NULL); #else void changeTutorialState(eTutorial_State newState, UIScene* scene = NULL); @@ -198,7 +198,7 @@ public: std::vector* getTasks(); unsigned int getCurrentTaskIndex(); -#ifdef _XBOX +#if 0 CXuiScene* getScene() { return m_UIScene; } #else UIScene* getScene() { return m_UIScene; } diff --git a/Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.cpp index 5428a318e..e7c05e7da 100644 --- a/Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.cpp +++ b/Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.cpp @@ -1,17 +1,17 @@ #include "../../Minecraft.World/Platform/stdafx.h" #include "../../Minecraft.World/Items/ItemInstance.h" -#if !(defined _XBOX) && !(defined __PSVITA__) +#if !(0) && !(0) #include "../UI/UI.h" #endif #include "Tutorial.h" #include "XuiCraftingTask.h" bool XuiCraftingTask::isCompleted() { -#ifndef __PSVITA__ +#if 1 // This doesn't seem to work // IUIScene_CraftingMenu *craftScene = // reinterpret_cast(tutorial->getScene()); -#ifdef _XBOX +#if 0 CXuiSceneCraftingPanel* craftScene = (CXuiSceneCraftingPanel*)(tutorial->getScene()); #else diff --git a/Minecraft.Client/Platform/Common/UI/IUIController.h b/Minecraft.Client/Platform/Common/UI/IUIController.h index 304f1459e..70b01d718 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIController.h +++ b/Minecraft.Client/Platform/Common/UI/IUIController.h @@ -57,7 +57,7 @@ public: virtual void HandleDLCMountingComplete() = 0; virtual void HandleDLCInstalled(int iPad) = 0; -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange() = 0; #endif virtual void HandleTMSDLCFileRetrieved(int iPad) = 0; diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp index 9acb8fa64..5030106e4 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -9,7 +9,7 @@ #include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../../Minecraft.Client/Minecraft.h" -#ifdef __ORBIS__ +#if 0 #include #endif @@ -77,7 +77,7 @@ void IUIScene_AbstractContainerMenu::Initialize( // m_bFirstTouchStored[i]=false; // } -#ifdef __ORBIS__ +#if 0 for (int i = 0; i < XUSER_MAX_COUNT; i++) { m_bFirstTouchStored[i] = false; } @@ -255,7 +255,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick() { ((float)app.GetGameSettings(iPad, eGameSetting_Sensitivity_InMenu) / 100.0f); // apply the sensitivity -#ifdef __ORBIS__ +#if 0 // should have sensitivity for the touchpad //(float)app.GetGameSettings(iPad,eGameSetting_Sensitivity_TouchPadInMenu)/100.0f @@ -444,7 +444,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick() { #endif } -#ifdef __ORBIS__ +#if 0 } #endif @@ -848,7 +848,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick() { buttonX = eToolTipPickUpHalf; } -#ifdef __PSVITA__ +#if 0 if (!InputManager.IsVitaTV()) { buttonBack = eToolTipWhatIsThis; } else @@ -1180,7 +1180,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, } } -#ifdef _XBOX +#if 0 ui.AnimateKeyPress(iPad, iAction); #else ui.AnimateKeyPress(iPad, iAction, bRepeat, true, false); @@ -1202,7 +1202,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, break; #endif case ACTION_MENU_A: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (!bRepeat) { diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.h index 153a25b9e..07a365fe4 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.h +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.h @@ -164,7 +164,7 @@ protected: int m_iCurrSlotX; int m_iCurrSlotY; -#ifdef __ORBIS__ +#if 0 bool m_bFirstTouchStored[XUSER_MAX_COUNT]; // monitor the first position of // a touch, so we can use diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.cpp index 635258901..4a6bd90c5 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.cpp @@ -166,7 +166,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) { bHandled = true; break; case ACTION_MENU_A: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif // Do some crafting! @@ -463,7 +463,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) { (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen())) { bNoScrollSlots = true; } -#ifdef __PSVITA__ +#if 0 bNoScrollSlots = true; #endif @@ -1016,7 +1016,7 @@ void IUIScene_CraftingMenu::UpdateVerticalSlots() { (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen())) { bNoScrollSlots = true; } -#ifdef __PSVITA__ +#if 0 bNoScrollSlots = true; #endif diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp index 635c0414d..7b4e90e14 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp @@ -14,7 +14,7 @@ int IUIScene_PauseMenu::ExitGameDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { -#ifdef _XBOX +#if 0 IUIScene_PauseMenu* pScene = (IUIScene_PauseMenu*)pParam; #else IUIScene_PauseMenu* pScene = dynamic_cast( @@ -31,7 +31,7 @@ int IUIScene_PauseMenu::ExitGameDialogReturned( int IUIScene_PauseMenu::ExitGameSaveDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { -#ifdef _XBOX +#if 0 IUIScene_PauseMenu* pScene = (IUIScene_PauseMenu*)pParam; #else IUIScene_PauseMenu* pScene = dynamic_cast( @@ -56,7 +56,7 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned( ->getDLCInfoParentPack(); // tPack->getDLCPack(); if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { -#ifdef _XBOX +#if 0 // upsell ULONGLONG ullOfferID_Full; // get the dlc texture pack @@ -105,7 +105,7 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned( &IUIScene_PauseMenu::ExitGameAndSaveReturned, pParam); return 0; } else { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 StorageManager.SetSaveDisabled(false); #endif MinecraftServer::getInstance()->setSaveOnExit(true); @@ -132,7 +132,7 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned( int IUIScene_PauseMenu::ExitGameAndSaveReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // 4J-PB - we won't come in here if we have a trial texture pack -#ifdef _XBOX +#if 0 IUIScene_PauseMenu* pScene = (IUIScene_PauseMenu*)pParam; #else IUIScene_PauseMenu* pScene = dynamic_cast( @@ -146,7 +146,7 @@ int IUIScene_PauseMenu::ExitGameAndSaveReturned( // StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); // SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), // saveOrCheckpointId); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 StorageManager.SetSaveDisabled(false); #endif if (pScene) pScene->SetIgnoreInput(true); @@ -183,7 +183,7 @@ int IUIScene_PauseMenu::ExitGameAndSaveReturned( int IUIScene_PauseMenu::ExitGameDeclineSaveReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { -#ifdef _XBOX +#if 0 IUIScene_PauseMenu* pScene = (IUIScene_PauseMenu*)pParam; #else IUIScene_PauseMenu* pScene = dynamic_cast( @@ -192,7 +192,7 @@ int IUIScene_PauseMenu::ExitGameDeclineSaveReturned( // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 // Don't do this here, as it will still try and save some things even // though it shouldn't! // StorageManager.SetSaveDisabled(false); @@ -231,7 +231,7 @@ int IUIScene_PauseMenu::ExitGameDeclineSaveReturned( int IUIScene_PauseMenu::WarningTrialTexturePackReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (result == C4JStorage::EMessage_ResultAccept) { if (!ProfileManager.IsSignedInLive(iPad)) { // you're not signed in to PSN! @@ -271,7 +271,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned( // we have to retrieve the skuid from the store info, it // can't be hardcoded since Sony may change it. So we assume // the first sku for the product is the one we want -#ifdef __ORBIS__ +#if 0 sprintf(chName, "%s", pSONYDLCInfo->chDLCKeyname); #else sprintf(chName, "%s-%s", app.GetCommerceCategory(), @@ -279,7 +279,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned( #endif app.GetDLCSkuIDFromProductList(chName, chSkuID); // 4J-PB - need to check for an empty store -#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__ +#if 0 || 0 || 0 if (app.CheckForEmptyStore(iPad) == false) #endif { @@ -295,7 +295,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned( } #endif // -#ifdef _XBOX_ONE +#if 0 IUIScene_PauseMenu* pScene = (IUIScene_PauseMenu*)pParam; if (result == C4JStorage::EMessage_ResultAccept) { @@ -323,7 +323,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned( // Trial to Full texture pack and is not messaged why. unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad); } } @@ -331,7 +331,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned( #endif -#ifdef _XBOX +#if 0 IUIScene_PauseMenu* pScene = (IUIScene_PauseMenu*)pParam; // pScene->m_bIgnoreInput = false; @@ -400,7 +400,7 @@ int IUIScene_PauseMenu::SaveWorldThreadProc(void* lpParameter) { if (!MinecraftServer::serverHalted() && !app.GetChangingSessionType()) app.SetGameStarted(true); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 if (app.GetGameHostOption(eGameHostOption_DisableSaving)) StorageManager.SetSaveDisabled(true); #endif @@ -459,7 +459,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL; exitReasonTitleId = IDS_CONNECTION_FAILED; break; -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 case DisconnectPacket:: eDisconnect_ContentRestricted_AllLocal: exitReasonStringId = @@ -472,7 +472,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { exitReasonTitleId = IDS_CONNECTION_FAILED; break; #endif -#ifdef _XBOX +#if 0 case DisconnectPacket::eDisconnect_NoUGC_Remote: exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE; @@ -485,7 +485,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { case DisconnectPacket::eDisconnect_Quitting: exitReasonStringId = IDS_DISCONNECTED_SERVER_QUIT; break; -#ifdef __ORBIS__ +#if 0 case DisconnectPacket::eDisconnect_NetworkError: exitReasonStringId = IDS_ERROR_NETWORK_EXIT; exitReasonTitleId = IDS_ERROR_NETWORK_TITLE; @@ -516,14 +516,14 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL; exitReasonTitleId = IDS_CANTJOIN_TITLE; break; -#ifdef _XBOX_ONE +#if 0 case DisconnectPacket::eDisconnect_ExitedGame: exitReasonTitleId = IDS_EXIT_GAME; exitReasonStringId = IDS_DISCONNECTED_EXITED_GAME; break; #endif -#if defined __ORBIS__ || defined __PS3__ || defined __PSVITA__ +#if 0 || 0 || 0 case DisconnectPacket::eDisconnect_NATMismatch: exitReasonStringId = IDS_DISCONNECTED_NAT_TYPE_MISMATCH; exitReasonTitleId = IDS_CONNECTION_FAILED; @@ -598,7 +598,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL; exitReasonTitleId = IDS_CONNECTION_FAILED; break; -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 case DisconnectPacket::eDisconnect_ContentRestricted_AllLocal: exitReasonStringId = IDS_CONTENT_RESTRICTION_MULTIPLAYER; exitReasonTitleId = IDS_CONNECTION_FAILED; @@ -609,7 +609,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { exitReasonTitleId = IDS_CONNECTION_FAILED; break; #endif -#ifdef _XBOX +#if 0 case DisconnectPacket::eDisconnect_NoUGC_Remote: exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE; @@ -619,7 +619,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { case DisconnectPacket::eDisconnect_Quitting: exitReasonStringId = IDS_DISCONNECTED_SERVER_QUIT; break; -#ifdef __ORBIS__ +#if 0 case DisconnectPacket::eDisconnect_NetworkError: exitReasonStringId = IDS_ERROR_NETWORK_EXIT; exitReasonTitleId = IDS_ERROR_NETWORK_TITLE; @@ -640,7 +640,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL; exitReasonTitleId = IDS_CANTJOIN_TITLE; break; -#if defined __ORBIS__ || defined __PS3__ || defined __PSVITA__ +#if 0 || 0 || 0 case DisconnectPacket::eDisconnect_NATMismatch: exitReasonStringId = IDS_DISCONNECTED_NAT_TYPE_MISMATCH; exitReasonTitleId = IDS_CONNECTION_FAILED; @@ -690,7 +690,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { app.SetReallyChangingSessionType(false); pMinecraft->exitingWorldRightNow = false; -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 // Make sure we don't think saving is disabled in the menus StorageManager.SetSaveDisabled(false); #endif @@ -700,7 +700,7 @@ int IUIScene_PauseMenu::SaveGameDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.cpp index 8e93e3e7d..54319c799 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.cpp +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.cpp @@ -50,10 +50,10 @@ void IUIScene_StartGame::HandleDLCMountingComplete() { for (unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i) { bTexturePackAlreadyListed = false; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 char* pchName = app.GetDLCInfoTextures(i); pDLCInfo = app.GetDLCInfo(pchName); -#elif defined _XBOX_ONE +#elif 0 pDLCInfo = app.GetDLCInfoForFullOfferID( const_cast(app.GetDLCInfoTexturesFullOffer(i).c_str())); #else @@ -257,7 +257,7 @@ int IUIScene_StartGame::UnlockTexturePackReturned( if (result == C4JStorage::EMessage_ResultAccept) { if (ProfileManager.IsSignedIn(iPad)) { -#if defined _XBOX //|| defined _XBOX_ONE +#if 0 //|| 0 ULONGLONG ullIndexA[1]; DLC_INFO* pDLCInfo = app.GetDLCInfoForTrialOfferID( pScene->m_pDLCPack->getPurchaseOfferId()); @@ -269,7 +269,7 @@ int IUIScene_StartGame::UnlockTexturePackReturned( } StorageManager.InstallOffer(1, ullIndexA, NULL, NULL); -#elif defined _XBOX_ONE +#elif 0 // StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,NULL,NULL); #endif @@ -277,7 +277,7 @@ int IUIScene_StartGame::UnlockTexturePackReturned( // will cause this scene to refresh } } else { -#if defined _XBOX +#if 0 TelemetryManager->RecordUpsellResponded( iPad, eSet_UpsellID_Texture_DLC, (pScene->m_pDLCPack->getPurchaseOfferId() & 0xFFFFFFFF), @@ -294,7 +294,7 @@ int IUIScene_StartGame::TexturePackDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { IUIScene_StartGame* pClass = (IUIScene_StartGame*)pParam; -#ifdef _XBOX +#if 0 // Exit with or without saving // Decline means install full version of the texture pack in this dialog if (result == C4JStorage::EMessage_ResultDecline || @@ -325,7 +325,7 @@ int IUIScene_StartGame::TexturePackDialogReturned( } } } -#elif defined _XBOX_ONE +#elif 0 // Get the product id from the texture pack id if (result == C4JStorage::EMessage_ResultAccept) { if (ProfileManager.IsSignedIn(iPad)) { @@ -345,7 +345,7 @@ int IUIScene_StartGame::TexturePackDialogReturned( // Trial to Full texture pack and is not messaged why. unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestMessageBox(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad, NULL, NULL, app.GetStringTable()); } } diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.cpp index 42618b950..b079d5998 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.cpp @@ -53,7 +53,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) { handled = true; break; case ACTION_MENU_A: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (!m_activeOffers.empty()) { diff --git a/Minecraft.Client/Platform/Common/UI/UI.h b/Minecraft.Client/Platform/Common/UI/UI.h index 428b3b904..fb47e1bf2 100644 --- a/Minecraft.Client/Platform/Common/UI/UI.h +++ b/Minecraft.Client/Platform/Common/UI/UI.h @@ -38,7 +38,7 @@ #include "UIControl_SpaceIndicatorBar.h" #include "UIControl_BeaconEffectButton.h" -#ifdef __PSVITA__ +#if 0 #include "UIControl_Touch.h" #endif @@ -117,7 +117,7 @@ #include "UIScene_InGameInfoMenu.h" #include "UIScene_InGameHostOptionsMenu.h" #include "UIScene_InGamePlayerOptionsMenu.h" -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 #include "UIScene_InGameSaveManagementMenu.h" #endif #include "UIScene_TeleportMenu.h" diff --git a/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp index 95b0e0315..3135927c6 100644 --- a/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp @@ -12,15 +12,15 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide( IggyDataValue value[1]; value[0].type = IGGY_DATATYPE_number; value[0].number = (F64)0; // WIN64 -#if defined _XBOX +#if 0 value[0].number = (F64)1; -#elif defined _DURANGO +#elif 0 value[0].number = (F64)2; -#elif defined __PS3__ +#elif 0 value[0].number = (F64)3; -#elif defined __ORBIS__ +#elif 0 value[0].number = (F64)4; -#elif defined __PSVITA__ +#elif 0 value[0].number = (F64)5; #elif defined _WINDOWS64 || defined __linux__ value[0].number = (F64)0; diff --git a/Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.cpp index bcad3c89f..2f752d1bb 100644 --- a/Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.cpp @@ -24,13 +24,13 @@ UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, // 4J-JEV: This object is persistent, so this string needs to be able to // handle language changes. -#ifdef __ORBIS__ +#if 0 m_labelPressStart.init((UIString)[] { return replaceAll(app.GetString(IDS_PRESS_X_TO_JOIN), L"{*CONTROLLER_VK_A*}", app.GetVKReplacement(VK_PAD_A)); }); -#elif defined _XBOX_ONE +#elif 0 m_labelPressStart.init((UIString)[] { return replaceAll(app.GetString(IDS_PRESS_START_TO_JOIN), L"{*CONTROLLER_VK_START*}", @@ -148,7 +148,7 @@ void UIComponent_PressStartToPlay::showSaveIcon(bool show) { } void UIComponent_PressStartToPlay::showPlayerDisplayName(bool show) { -#ifdef _XBOX_ONE +#if 0 if (show) { m_playerDisplayName.setLabel( ProfileManager.GetDisplayName(ProfileManager.GetPrimaryPad())); diff --git a/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp index f03c6f2a2..c2daa58ad 100644 --- a/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp @@ -13,14 +13,14 @@ UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData, // Setup all the Iggy references we need for this scene initialiseMovie(); -#ifdef __PSVITA__ +#if 0 // initialise vita touch controls with ids for (unsigned int i = 0; i < ETouchInput_Count; ++i) { m_TouchController[i].init(i); } #endif -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (InputManager.IsCircleCrossSwapped()) { IggyDataValue result; IggyDataValue value[1]; @@ -59,7 +59,7 @@ F64 UIComponent_Tooltips::getSafeZoneHalfWidth() { float safeWidth = 0.0f; -#ifndef __PSVITA__ +#if 1 // 85% safezone for tooltips in either SD mode if (!RenderManager.IsHiDef()) { // 85% safezone @@ -331,13 +331,13 @@ void UIComponent_Tooltips::_Relayout() { IggyPlayerRootPath(getMovie()), m_funcUpdateLayout, 0, NULL); -#ifdef __PSVITA__ +#if 0 // rebuild touchboxes ui.TouchBoxRebuild(this); #endif } -#ifdef __PSVITA__ +#if 0 void UIComponent_Tooltips::handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased) { @@ -419,7 +419,7 @@ void UIComponent_Tooltips::handleTouchInput(unsigned int iPad, S32 x, S32 y, void UIComponent_Tooltips::handleReload() { app.DebugPrintf("UIComponent_Tooltips::handleReload\n"); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (InputManager.IsCircleCrossSwapped()) { IggyDataValue result; IggyDataValue value[1]; diff --git a/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.h b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.h index c0dbb83a6..1405bade0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.h +++ b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.h @@ -24,7 +24,7 @@ protected: IggyName m_funcSetTooltip, m_funcSetOpacity, m_funcSetABSwap, m_funcUpdateLayout; -#ifdef __PSVITA__ +#if 0 enum ETouchInput { ETouchInput_Touch_A, ETouchInput_Touch_B, @@ -44,7 +44,7 @@ protected: #endif UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) -#ifdef __PSVITA__ +#if 0 UI_MAP_ELEMENT(m_TouchController[ETouchInput_Touch_A], "Touch_A") UI_MAP_ELEMENT(m_TouchController[ETouchInput_Touch_B], "Touch_B") UI_MAP_ELEMENT(m_TouchController[ETouchInput_Touch_X], "Touch_X") @@ -118,7 +118,7 @@ private: bool m_overrideSFX[XUSER_MAX_COUNT][ACTION_MAX_MENU]; -#ifdef __PSVITA__ +#if 0 virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIControl.cpp b/Minecraft.Client/Platform/Common/UI/UIControl.cpp index 234d9bb99..3973f6534 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl.cpp @@ -42,7 +42,7 @@ bool UIControl::setupControl(UIScene* scene, IggyValuePath* parent, return res; } -#ifdef __PSVITA__ +#if 0 void UIControl::UpdateControl() { F64 fx, fy, fwidth, fheight; IggyValueGetF64RS(getIggyValuePath(), m_nameXPos, NULL, &fx); @@ -54,7 +54,7 @@ void UIControl::UpdateControl() { m_width = (S32)Math::round(fwidth); m_height = (S32)Math::round(fheight); } -#endif // __PSVITA__ +#endif // 0 void UIControl::ReInit() { if (m_lastOpacity != 1.0f) { diff --git a/Minecraft.Client/Platform/Common/UI/UIControl.h b/Minecraft.Client/Platform/Common/UI/UIControl.h index 19cdb9ad4..01f5416c4 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl.h +++ b/Minecraft.Client/Platform/Common/UI/UIControl.h @@ -59,7 +59,7 @@ public: virtual bool setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName); -#ifdef __PSVITA__ +#if 0 void UpdateControl(); void setHidden(bool bHidden) { m_bHidden = bHidden; } bool getHidden(void) { return m_bHidden; } diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp index 70665860e..965e6182c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp @@ -36,7 +36,7 @@ void UIControl_Button::init(UIString label, int id) { IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_initFunc, 2, value); -#ifdef __PSVITA__ +#if 0 // 4J-PB - add this button to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp index b2beffec7..a85b268e4 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp @@ -35,7 +35,7 @@ void UIControl_ButtonList::init(int id) { IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_initFunc, 1, value); -#ifdef __PSVITA__ +#if 0 // 4J-PB - add this buttonlist to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { @@ -162,7 +162,7 @@ void UIControl_ButtonList::setButtonLabel(int iButtonId, m_funcSetButtonLabel, 2, value); } -#ifdef __PSVITA__ +#if 0 void UIControl_ButtonList::SetTouchFocus(S32 iX, S32 iY, bool bRepeat) { IggyDataValue result; IggyDataValue value[3]; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.h b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.h index 422e2c7ed..5bdc61a84 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.h +++ b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.h @@ -39,7 +39,7 @@ public: void setButtonLabel(int iButtonId, const std::wstring& label); -#ifdef __PSVITA__ +#if 0 void SetTouchFocus(S32 iX, S32 iY, bool bRepeat); bool CanTouchTrigger(S32 iX, S32 iY); #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp index 3befba57d..455956cd0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp @@ -44,7 +44,7 @@ void UIControl_CheckBox::init(UIString label, int id, bool checked) { IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_initFunc, 3, value); -#ifdef __PSVITA__ +#if 0 // 4J-TomK - add checkbox to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp index 5c45d4564..d7d3bd485 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp @@ -42,7 +42,7 @@ void UIControl_DynamicLabel::addText(const std::wstring& text, void UIControl_DynamicLabel::ReInit() { UIControl_Base::ReInit(); } void UIControl_DynamicLabel::SetupTouch() { -#ifdef __PSVITA__ +#if 0 // 4J-TomK - add this dynamic label to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.cpp index b295bf24d..e2cf23631 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.cpp @@ -48,7 +48,7 @@ void UIControl_HTMLLabel::setLabel(const std::string& label) { } void UIControl_HTMLLabel::SetupTouch() { -#ifdef __PSVITA__ +#if 0 // 4J-TomK - add this dynamic label to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp index e6799360e..ed926eb89 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp @@ -16,7 +16,7 @@ bool UIControl_LeaderboardList::setupControl(UIScene* scene, m_funcResetLeaderboard = registerFastName(L"ResetLeaderboard"); m_funcSetupTitles = registerFastName(L"SetupTitles"); m_funcSetColumnIcon = registerFastName(L"SetColumnIcon"); -#ifdef __PSVITA__ +#if 0 m_funcSetTouchFocus = registerFastName(L"SetTouchFocus"); m_bTouchInitialised = false; #endif @@ -91,7 +91,7 @@ void UIControl_LeaderboardList::initLeaderboard(int iFirstFocus, getIggyValuePath(), m_funcInitLeaderboard, 3, value); -#ifdef __PSVITA__ +#if 0 // 4J-PB - add this button to the vita touch box list if (!m_bTouchInitialised) { switch (m_parentScene->GetParentLayer()->m_iLayer) { @@ -232,7 +232,7 @@ void UIControl_LeaderboardList::addDataSet( getIggyValuePath(), m_funcAddDataSet, 12, value); } -#ifdef __PSVITA__ +#if 0 void UIControl_LeaderboardList::SetTouchFocus(S32 iX, S32 iY, bool bRepeat) { IggyDataValue result; IggyDataValue value[3]; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.h b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.h index c39139191..6f44cf100 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.h +++ b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.h @@ -7,7 +7,7 @@ private: IggyName m_funcInitLeaderboard, m_funcAddDataSet; IggyName m_funcResetLeaderboard; IggyName m_funcSetupTitles, m_funcSetColumnIcon; -#ifdef __PSVITA__ +#if 0 IggyName m_funcSetTouchFocus; bool m_bTouchInitialised; #endif @@ -48,7 +48,7 @@ public: const std::wstring& col4, const std::wstring& col5, const std::wstring& col6); -#ifdef __PSVITA__ +#if 0 void SetTouchFocus(S32 iX, S32 iY, bool bRepeat); #endif }; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.cpp index 5720ceafa..50975304e 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.cpp @@ -326,7 +326,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, // 4J - TomK - pull up character a bit more to make sure extra geo around // feet doesn't cause rendering problems on PSVita -#ifdef __PSVITA__ +#if 0 glTranslatef(0, -24 * _scale - 1.0f / 16.0f, 0); #else glTranslatef(0, -24 * _scale - 0.125f / 16.0f, 0); diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp index f5188b7a0..4d8dba439 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp @@ -55,7 +55,7 @@ void UIControl_Slider::init(UIString label, int id, int min, int max, IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_initFunc, 5, value); -#ifdef __PSVITA__ +#if 0 // 4J-TomK - add slider to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp index 15d6de392..c33f45897 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp @@ -39,7 +39,7 @@ void UIControl_TextInput::init(UIString label, int id) { IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_initFunc, 2, value); -#ifdef __PSVITA__ +#if 0 // 4J-TomK - add this buttonlist to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp index 9ee8fad74..c7e70f8dd 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp @@ -43,7 +43,7 @@ void UIControl_TexturePackList::init(const std::wstring& label, int id) { IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_initFunc, 2, value); -#ifdef __PSVITA__ +#if 0 // 4J-TomK - add this texturepack list to the vita touch box list switch (m_parentScene->GetParentLayer()->m_iLayer) { diff --git a/Minecraft.Client/Platform/Common/UI/UIController.cpp b/Minecraft.Client/Platform/Common/UI/UIController.cpp index 7aeaeeda5..6de31edc2 100644 --- a/Minecraft.Client/Platform/Common/UI/UIController.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIController.cpp @@ -12,7 +12,7 @@ #include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../../Minecraft.Client/UI/Screens/TitleScreen.h" #include "UIFontData.h" -#ifdef __PSVITA__ +#if 0 #include #endif @@ -171,7 +171,7 @@ UIController::UIController() { // 4J Stu - This is a bit of a hack until we change the Minecraft // initialisation to store the proper screen size for other platforms -#if defined _WINDOWS64 || defined _DURANGO || defined __ORBIS__ || \ +#if defined _WINDOWS64 || 0 || 0 || \ defined(__linux__) m_fScreenWidth = 1920.0f; m_fScreenHeight = 1080.0f; @@ -212,7 +212,7 @@ UIController::UIController() { InitializeCriticalSection(&m_registeredCallbackScenesCS); // m_bSysUIShowing=false; m_bSystemUIShowing = false; -#ifdef __PSVITA__ +#if 0 m_bTouchscreenPressed = false; #endif @@ -301,7 +301,7 @@ UIController::EFont UIController::getFontForLanguage(int language) { switch (language) { case XC_LANGUAGE_JAPANESE: return eFont_Japanese; -#ifdef _DURANGO +#if 0 case XC_LANGUAGE_SCHINESE: return eFont_SimpChinese; #endif @@ -316,7 +316,7 @@ UIController::EFont UIController::getFontForLanguage(int language) { UITTFFont* UIController::createFont(EFont fontLanguage) { switch (fontLanguage) { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", "Common/Media/font/JPN/DF-DotDotGothic16.ttf", @@ -335,7 +335,7 @@ UITTFFont* UIController::createFont(EFont fontLanguage) { return new UITTFFont("Mojangles_TTF_jaJP", "Common/Media/font/JPN/DFGMaruGothic-Md.ttf", 0x2022); // JPN -#ifdef _DURANGO +#if 0 case eFont_SimpChinese: return new UITTFFont("Mojangled_TTF_cnCN", "Common/Media/font/CHS/MSYH.ttf", @@ -489,9 +489,9 @@ void UIController::tick() { void UIController::loadSkins() { std::wstring platformSkinPath = L""; -#ifdef __PS3__ +#if 0 platformSkinPath = L"skinPS3.swf"; -#elif defined __PSVITA__ +#elif 0 platformSkinPath = L"skinVita.swf"; #elif defined(_WINDOWS64) || defined(__linux__) if (m_fScreenHeight == 1080.0f) { @@ -499,13 +499,13 @@ void UIController::loadSkins() { } else { platformSkinPath = L"skinWin.swf"; } -#elif defined _DURANGO +#elif 0 if (m_fScreenHeight == 1080.0f) { platformSkinPath = L"skinHDDurango.swf"; } else { platformSkinPath = L"skinDurango.swf"; } -#elif defined __ORBIS__ +#elif 0 if (m_fScreenHeight == 1080.0f) { platformSkinPath = L"skinHDOrbis.swf"; } else { @@ -522,7 +522,7 @@ void UIController::loadSkins() { loadSkin(platformSkinPath, L"platformskin.swf"); } -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf"); m_iggyLibraries[eLibrary_GraphicsHUD] = @@ -543,7 +543,7 @@ void UIController::loadSkins() { m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf"); #endif -#if (defined(_WINDOWS64) || defined(_DURANGO) || defined(__ORBIS__) || \ +#if (defined(_WINDOWS64) || 0 || 0 || \ defined(__linux__)) #if defined(_WINDOWS64) @@ -723,7 +723,7 @@ void UIController::CleanUpSkinReload() { if (!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) { if (!Minecraft::GetInstance()->skins->getSelected()->hasAudio()) { -#ifdef _DURANGO +#if 0 const unsigned int result = StorageManager.UnmountInstalledDLC(L"TPACK"); #else @@ -785,7 +785,7 @@ void UIController::handleInput() { // For each user, loop over each key type and send messages based on the // state for (unsigned int iPad = 0; iPad < XUSER_MAX_COUNT; ++iPad) { -#ifdef _DURANGO +#if 0 // 4J-JEV: Added exception for primary play who migh've uttered speech // commands. if (iPad != ProfileManager.GetPrimaryPad() && @@ -797,13 +797,13 @@ void UIController::handleInput() { handleKeyPress(iPad, key); } -#ifdef __PSVITA__ +#if 0 // CD - Vita requires key press 40 - select [MINECRAFT_ACTION_GAME_INFO] handleKeyPress(iPad, MINECRAFT_ACTION_GAME_INFO); #endif } -#ifdef _DURANGO +#if 0 if (!app.GetGameStarted()) { bool repeat = false; int firstUnfocussedUnhandledPad = -1; @@ -852,7 +852,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key) { bool released = false; // Toggle bool repeat = false; -#ifdef __PSVITA__ +#if 0 if (key == ACTION_MENU_OK) { bool bTouchScreenInput = false; @@ -1030,7 +1030,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key) { // 4J Stu - Removed this function #if 0 -#ifdef __PS3__ +#if 0 //if ( pressed && // !repeat && // //app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<getRenderHeight(); LONG left, right, top, bottom; -#ifdef __PS3__ +#if 0 if (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) { // 4J Stu - Our SD target on PS3 is double width left = m_tileOriginX + @@ -1388,7 +1388,7 @@ void UIController::setupCustomDrawGameStateAndMatrices( } void UIController::endCustomDrawGameState() { -#if defined(__ORBIS__) || defined(__linux__) +#if 0 || defined(__linux__) RenderManager.Clear(GL_DEPTH_BUFFER_BIT); #else RenderManager.Clear(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect); @@ -1461,7 +1461,7 @@ GDrawTexture* RADLINK UIController::TextureSubstitutionCreateCallback( // 4J Stu - All our flash controls that allow replacing textures use // a special 64x64 symbol Force this size here so that our images // don't get scaled wildly -#if (defined __ORBIS__ || defined _DURANGO) +#if (0 || 0) *width = 96; *height = 96; #else @@ -1699,7 +1699,7 @@ void UIController::NavigateToHomeMenu() { // { // pDLCTexPack->m_pSoundBank->Destroy(); // } -#ifdef _XBOX_ONE +#if 0 const unsigned int result = StorageManager.UnmountInstalledDLC(L"TPACK"); #else @@ -1948,7 +1948,7 @@ void UIController::SetMenuDisplayed(int iPad, bool bVal) { m_bMenuToBeClosed[iPad] = true; m_iCountDown[iPad] = 10; -#ifdef _DURANGO +#if 0 // 4J-JEV: When in-game, allow player to toggle the 'Pause' and // 'IngameInfo' menus via Kinnect. if (Minecraft::GetInstance()->running) @@ -2029,11 +2029,11 @@ void UIController::SetTooltips(unsigned int iPad, int iA, int iB, int iX, EUIGroup group; // 4J-PB - strip out any that are not applicable on the platform -#ifndef _XBOX +#if 1 if (iX == IDS_TOOLTIPS_SELECTDEVICE) iX = -1; if (iX == IDS_TOOLTIPS_CHANGEDEVICE) iX = -1; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (iY == IDS_TOOLTIPS_VIEW_GAMERCARD) iY = -1; if (iY == IDS_TOOLTIPS_VIEW_GAMERPROFILE) iY = -1; @@ -2191,7 +2191,7 @@ void UIController::HandleDLCInstalled(int iPad) { } } -#ifdef _XBOX_ONE +#if 0 void UIController::HandleDLCLicenseChange() { for (unsigned int i = 0; i < eUIGroup_COUNT; ++i) { app.DebugPrintf("UIController::HandleDLCLicenseChange - m_groups[%d]\n", @@ -2267,7 +2267,7 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo* info) { } } -#ifndef _XBOX +#if 1 void UIController::RemoveInteractSceneReference(int iPad, UIScene* scene) { EUIGroup group; if ((iPad != 255) && (iPad >= 0)) @@ -2333,7 +2333,7 @@ void UIController::UpdatePlayerBasePositions() { // we don't need Changing the viewport to fullscreen for users that // no longer exist is SLOW This should probably be on all platforms, // but I don't have time to test them all just now! -#ifndef __ORBIS__ +#if 1 m_groups[idx + 1]->SetViewportType( C4JRender::VIEWPORT_TYPE_FULLSCREEN); #endif @@ -2430,7 +2430,7 @@ void UIController::ShowAutosaveCountdownTimer(bool show) { } void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds) { -#if !(defined(_XBOX_ONE) || defined(__ORBIS__)) +#if !(0 || 0) wchar_t wcAutosaveCountdown[100]; swprintf(wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN), uiSeconds); @@ -2608,12 +2608,12 @@ C4JStorage::EMessageResult UIController::RequestUGCMessageBox( // Default pad to primary player if (iPad == -1) iPad = ProfileManager.GetPrimaryPad(); -#ifdef __ORBIS__ +#if 0 // Show the vague UGC system message in addition to our message ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_UGC_RESTRICTION, iPad); return C4JStorage::EMessage_ResultAccept; -#elif defined(__PSVITA__) +#elif 0 ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, iPad); unsigned int uiIDA[1]; @@ -2638,7 +2638,7 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox( } if (message == -1) { -#if defined(_XBOX_ONE) || defined(_WINDOWS64) || defined(__linux__) +#if 0 || defined(_WINDOWS64) || defined(__linux__) // IDS_CONTENT_RESTRICTION doesn't exist on XB1 message = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE; #else @@ -2649,12 +2649,12 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox( // Default pad to primary player if (iPad == -1) iPad = ProfileManager.GetPrimaryPad(); -#ifdef __ORBIS__ +#if 0 // Show the vague UGC system message in addition to our message ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_UGC_RESTRICTION, iPad); return C4JStorage::EMessage_ResultAccept; -#elif defined(__PSVITA__) +#elif 0 ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_AGE_RESTRICTION, iPad); return C4JStorage::EMessage_ResultAccept; @@ -2675,7 +2675,7 @@ void UIController::setFontCachingCalculationBuffer(int length) { draw call is not large enough, Iggy will crash or otherwise behave incorrectly. */ -#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __linux__ +#if 0 || 0 || defined _WIN64 || defined __linux__ static const int CHAR_SIZE = 24; #else static const int CHAR_SIZE = 16; @@ -2700,7 +2700,7 @@ UIScene* UIController::FindScene(EUIScene sceneType) { for (int i = 0; i < eUIGroup_COUNT; i++) { pScene = m_groups[i]->FindScene(sceneType); -#ifdef __PS3__ +#if 0 if (pScene != NULL) return pScene; #else if (pScene != nullptr) return pScene; @@ -2710,7 +2710,7 @@ UIScene* UIController::FindScene(EUIScene sceneType) { return pScene; } -#ifdef __PSVITA__ +#if 0 void UIController::TouchBoxAdd(UIControl* pControl, UIScene* pUIScene) { EUIGroup eUIGroup = pUIScene->GetParentLayerGroup(); diff --git a/Minecraft.Client/Platform/Common/UI/UIController.h b/Minecraft.Client/Platform/Common/UI/UIController.h index 5f01d17e8..9d6ae1435 100644 --- a/Minecraft.Client/Platform/Common/UI/UIController.h +++ b/Minecraft.Client/Platform/Common/UI/UIController.h @@ -74,7 +74,7 @@ public: private: // 4J-PB - ui element type for PSVita touch control -#ifdef __PSVITA__ +#if 0 typedef struct { UIControl* pControl; @@ -181,7 +181,7 @@ private: public: UIController(); -#ifdef __PSVITA__ +#if 0 void TouchBoxAdd(UIControl* pControl, UIScene* pUIScene); bool TouchBoxHit(UIScene* pUIScene, S32 x, S32 y); void TouchBoxesClear(UIScene* pUIScene); @@ -383,7 +383,7 @@ public: virtual void HandleDLCMountingComplete(); virtual void HandleDLCInstalled(int iPad); -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange(); #endif virtual void HandleTMSDLCFileRetrieved(int iPad); diff --git a/Minecraft.Client/Platform/Common/UI/UIEnums.h b/Minecraft.Client/Platform/Common/UI/UIEnums.h index f9a352e04..def283ca3 100644 --- a/Minecraft.Client/Platform/Common/UI/UIEnums.h +++ b/Minecraft.Client/Platform/Common/UI/UIEnums.h @@ -5,7 +5,7 @@ enum EUIGroup { eUIGroup_Fullscreen, eUIGroup_Player1, -#ifndef __PSVITA__ +#if 1 eUIGroup_Player2, eUIGroup_Player3, eUIGroup_Player4, @@ -103,7 +103,7 @@ enum EUIScene { eUIScene_HorseMenu, eUIScene_FireworksMenu, -#ifdef _XBOX +#if 0 // eUIScene_TransferToXboxOne, #endif @@ -116,7 +116,7 @@ enum EUIScene { // CConsoleMinecraftApp::NavigateToScene There are quite a few so you need to // check them all Also update UILayer::updateFocusState -#ifndef _XBOX +#if 1 // Anything non-xbox should be added here. The ordering of scenes above is // required for sentient reporting on xbox 360 to continue to be accurate eUIComponent_Panorama, @@ -133,7 +133,7 @@ enum EUIScene { eUIScene_EULA, eUIScene_InGameSaveManagementMenu, eUIScene_LanguageSelector, -#endif // ndef _XBOX +#endif // ndef 0 #ifdef _DEBUG_MENUS_ENABLED eUIScene_DebugOverlay, @@ -232,7 +232,7 @@ enum EHowToPlayPage { eHowToPlay_NetherPortal, eHowToPlay_TheEnd, -#ifdef _XBOX +#if 0 eHowToPlay_SocialMedia, eHowToPlay_BanList, #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIFontData.cpp b/Minecraft.Client/Platform/Common/UI/UIFontData.cpp index 8feb45f7f..411b0e703 100644 --- a/Minecraft.Client/Platform/Common/UI/UIFontData.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIFontData.cpp @@ -9,7 +9,7 @@ SFontData SFontData::Mojangles_7 = { /* Font Name */ "Mojangles7", -#ifdef _XBOX +#if 0 /* filename */ L"/font/Mojangles_7.png", #else /* Filename */ L"/TitleUpdate/res/font/Mojangles_7.png", @@ -39,7 +39,7 @@ SFontData SFontData::Mojangles_11 = { /* Font Name */ "Mojangles11", -#ifdef _XBOX +#if 0 /* filename */ L"/font/Mojangles_11.png", #else /* Filename */ L"/TitleUpdate/res/font/Mojangles_11.png", diff --git a/Minecraft.Client/Platform/Common/UI/UIGroup.cpp b/Minecraft.Client/Platform/Common/UI/UIGroup.cpp index c60a4b174..d664b0ce9 100644 --- a/Minecraft.Client/Platform/Common/UI/UIGroup.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIGroup.cpp @@ -17,7 +17,7 @@ UIGroup::UIGroup(EUIGroup group, int iPad) { for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { m_layers[i] = new UILayer(this); -#ifdef __PSVITA__ +#if 0 m_layers[i]->m_iLayer = (EUILayer)i; #endif } @@ -188,7 +188,7 @@ bool UIGroup::HasFocus(int iPad) { return hasFocus; } -#ifdef __PSVITA__ +#if 0 UIScene* UIGroup::getCurrentScene() { UIScene* pScene; for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { @@ -273,7 +273,7 @@ void UIGroup::HandleDLCInstalled() { } } -#ifdef _XBOX_ONE +#if 0 void UIGroup::HandleDLCLicenseChange() { // Ignore this group if the player isn't signed in if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return; @@ -369,7 +369,7 @@ UIScene* UIGroup::FindScene(EUIScene sceneType) { for (int i = 0; i < eUILayer_COUNT; i++) { pScene = m_layers[i]->FindScene(sceneType); -#ifdef __PS3__ +#if 0 if (pScene != NULL) return pScene; #else if (pScene != nullptr) return pScene; diff --git a/Minecraft.Client/Platform/Common/UI/UIGroup.h b/Minecraft.Client/Platform/Common/UI/UIGroup.h index 587a4de51..103fce732 100644 --- a/Minecraft.Client/Platform/Common/UI/UIGroup.h +++ b/Minecraft.Client/Platform/Common/UI/UIGroup.h @@ -37,7 +37,7 @@ private: public: UIGroup(EUIGroup group, int iPad); -#ifdef __PSVITA__ +#if 0 EUIGroup GetGroup() { return m_group; } #endif UIComponent_Tooltips* getTooltips() { return m_tooltips; } @@ -83,7 +83,7 @@ public: void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled); -#ifdef __PSVITA__ +#if 0 // Current active scene UIScene* getCurrentScene(); #endif @@ -104,7 +104,7 @@ public: virtual void HandleDLCMountingComplete(); virtual void HandleDLCInstalled(); -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange(); #endif virtual void HandleMessage(EUIMessage message, void* data); diff --git a/Minecraft.Client/Platform/Common/UI/UILayer.cpp b/Minecraft.Client/Platform/Common/UI/UILayer.cpp index 479e26aaa..7896c1fff 100644 --- a/Minecraft.Client/Platform/Common/UI/UILayer.cpp +++ b/Minecraft.Client/Platform/Common/UI/UILayer.cpp @@ -301,7 +301,7 @@ bool UILayer::NavigateToScene(int iPad, EUIScene scene, void* initData) { newScene = new UIScene_InGamePlayerOptionsMenu(iPad, initData, this); break; -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 case eUIScene_InGameSaveManagementMenu: newScene = new UIScene_InGameSaveManagementMenu(iPad, initData, this); @@ -540,7 +540,7 @@ void UILayer::removeComponent(EUIScene scene) { for (AUTO_VAR(compIt, m_components.begin()); compIt != m_components.end();) { if ((*compIt)->getSceneType() == scene) { -#ifdef __PSVITA__ +#if 0 // remove any touchboxes ui.TouchBoxesClear((*compIt)); #endif @@ -557,7 +557,7 @@ void UILayer::removeComponent(EUIScene scene) { } void UILayer::removeScene(UIScene* scene) { -#ifdef __PSVITA__ +#if 0 // remove any touchboxes ui.TouchBoxesClear(scene); #endif @@ -586,7 +586,7 @@ void UILayer::closeAllScenes() { temp.insert(temp.end(), m_sceneStack.begin(), m_sceneStack.end()); m_sceneStack.clear(); for (AUTO_VAR(it, temp.begin()); it != temp.end(); ++it) { -#ifdef __PSVITA__ +#if 0 // remove any touchboxes ui.TouchBoxesClear(*it); #endif @@ -645,7 +645,7 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */) { // (and likely Vita), but I'm removing it on XboxOne so that we // can avoid the scene creation time (which can be >0.5s) since // we have the memory to spare -#ifndef _XBOX_ONE +#if 1 m_scenesToDestroy.push_back(scene); #endif } @@ -711,7 +711,7 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */) { return m_hasFocus; } -#ifdef __PSVITA__ +#if 0 UIScene* UILayer::getCurrentScene() { // Note: reverse iterator, the last element is the top of the stack for (AUTO_VAR(it, m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) { @@ -767,7 +767,7 @@ void UILayer::HandleDLCInstalled() { } } -#ifdef _XBOX_ONE +#if 0 void UILayer::HandleDLCLicenseChange() { for (AUTO_VAR(it, m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) { UIScene* topScene = *it; diff --git a/Minecraft.Client/Platform/Common/UI/UILayer.h b/Minecraft.Client/Platform/Common/UI/UILayer.h index 9c5c796ec..a26bd74b7 100644 --- a/Minecraft.Client/Platform/Common/UI/UILayer.h +++ b/Minecraft.Client/Platform/Common/UI/UILayer.h @@ -17,7 +17,7 @@ private: std::vector m_scenesToDestroy; // A list of scenes where we want to dump the swf -#ifdef __ORBIS__ +#if 0 std::unordered_map, std::hash> m_componentRefCount; #else @@ -33,7 +33,7 @@ public: bool m_bIgnoreAutosaveMenuDisplayed; bool m_bIgnorePlayerJoinMenuDisplayed; -#ifdef __PSVITA__ +#if 0 EUILayer m_iLayer; #endif @@ -76,7 +76,7 @@ public: // INPUT void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled); -#ifdef __PSVITA__ +#if 0 // Current active scene UIScene* getCurrentScene(); #endif @@ -90,7 +90,7 @@ public: virtual void HandleDLCMountingComplete(); virtual void HandleDLCInstalled(); -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange(); #endif virtual void HandleMessage(EUIMessage message, void* data); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene.cpp b/Minecraft.Client/Platform/Common/UI/UIScene.cpp index c50a82230..225912a67 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene.cpp @@ -117,7 +117,7 @@ F64 UIScene::getSafeZoneHalfHeight() { float safeHeight = 0.0f; -#ifndef __PSVITA__ +#if 1 if (!RenderManager.IsHiDef() && RenderManager.IsWidescreen()) { // 90% safezone safeHeight = height * (0.15f / 2); @@ -133,7 +133,7 @@ F64 UIScene::getSafeZoneHalfWidth() { float width = ui.getScreenWidth(); float safeWidth = 0.0f; -#ifndef __PSVITA__ +#if 1 if (!RenderManager.IsHiDef() && RenderManager.IsWidescreen()) { // 85% safezone safeWidth = width * (0.15f / 2); @@ -223,7 +223,7 @@ void UIScene::initialiseMovie() { m_bUpdateOpacity = true; } -#ifdef __PSVITA__ +#if 0 void UIScene::SetFocusToElement(int iID) { IggyDataValue result; IggyDataValue value[1]; @@ -262,7 +262,7 @@ void UIScene::loadMovie() { // were being reloaded std::wstring moviePath = getMoviePath(); -#ifdef __PS3__ +#if 0 if (RenderManager.IsWidescreen()) { moviePath.append(L"720.swf"); m_loadedResolution = eSceneResolution_720; @@ -270,7 +270,7 @@ void UIScene::loadMovie() { moviePath.append(L"480.swf"); m_loadedResolution = eSceneResolution_480; } -#elif defined __PSVITA__ +#elif 0 moviePath.append(L"Vita.swf"); m_loadedResolution = eSceneResolution_Vita; #elif defined _WINDOWS64 @@ -498,7 +498,7 @@ void UIScene::removeControl(UIControl_Base* control, bool centreScene) { IggyPlayerRootPath(getMovie()), m_funcRemoveObject, 2, value); -#ifdef __PSVITA__ +#if 0 // update the button positions since they may have changed UpdateSceneControls(); @@ -592,7 +592,7 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion* region, int list = m_parentLayer->m_parentGroup->getCommandBufferList(); bool useCommandBuffers = false; -#ifdef _XBOX_ONE +#if 0 useCommandBuffers = true; // 4J Stu - Temporary until we fix the glint animation which @@ -601,7 +601,7 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion* region, #endif if (!useCommandBuffers || m_needsCacheRendered) { -#if (!defined __PS3__) && (!defined __PSVITA__) +#if (!0) && (!0) if (useCommandBuffers) RenderManager.CBuffStart(list, true); #endif PIXBeginNamedEvent(0, "Draw uncached"); @@ -627,13 +627,13 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion* region, delete drawData; } PIXEndNamedEvent(); -#ifndef __PS3__ +#if 1 if (useCommandBuffers) RenderManager.CBuffEnd(); #endif } m_cachedSlotDraw.clear(); -#ifndef __PS3__ +#if 1 if (useCommandBuffers) RenderManager.CBuffCall(list); #endif @@ -796,7 +796,7 @@ void UIScene::navigateBack() { } else { // m_parentLayer->removeScene(this); -#ifdef _DURANGO +#if 0 if (ui.GetTopScene(0)) InputManager.SetEnabledGtcButtons( ui.GetTopScene(0)->getDefaultGtcButtons()); @@ -860,7 +860,7 @@ void UIScene::loseFocus() { } void UIScene::handleGainFocus(bool navBack) { -#ifdef _DURANGO +#if 0 InputManager.SetEnabledGtcButtons(this->getDefaultGtcButtons()); #endif } @@ -894,7 +894,7 @@ int UIScene::convertGameActionToIggyKeycode(int action) { // TODO: This action to key mapping should probably use the control mapping int keycode = -1; switch (action) { -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_A: @@ -931,7 +931,7 @@ int UIScene::convertGameActionToIggyKeycode(int action) { keycode = IGGY_KEYCODE_PAGE_UP; break; case ACTION_MENU_PAGEDOWN: -#ifdef __PSVITA__ +#if 0 if (!InputManager.IsVitaTV()) { keycode = IGGY_KEYCODE_F6; } else @@ -1213,7 +1213,7 @@ int UIScene::getControlFocus() { return m_iFocusControl; } void UIScene::setBackScene(UIScene* scene) { m_backScene = scene; } UIScene* UIScene::getBackScene() { return m_backScene; } -#ifdef __PSVITA__ +#if 0 void UIScene::UpdateSceneControls() { AUTO_VAR(itEnd, GetControls()->end()); for (AUTO_VAR(it, GetControls()->begin()); it != itEnd; it++) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene.h b/Minecraft.Client/Platform/Common/UI/UIScene.h index b4948bfce..f35c145a9 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene.h @@ -112,7 +112,7 @@ public: int getRenderWidth() { return m_renderWidth; } int getRenderHeight() { return m_renderHeight; } -#ifdef __PSVITA__ +#if 0 UILayer* GetParentLayer() { return m_parentLayer; } EUIGroup GetParentLayerGroup() { return m_parentLayer->m_parentGroup->GetGroup(); @@ -148,7 +148,7 @@ public: virtual void tick(); IggyName registerFastName(const std::wstring& name); -#ifdef __PSVITA__ +#if 0 void SetFocusToElement(int iID); void UpdateSceneControls(); #endif @@ -273,7 +273,7 @@ public: UIScene* getBackScene(); virtual void HandleDLCMountingComplete() {} virtual void HandleDLCInstalled() {} -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange() {} #endif @@ -292,7 +292,7 @@ public: } protected: -#ifdef _DURANGO +#if 0 virtual long long getDefaultGtcButtons() { return _360_GTC_BACK; } #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp index f1de75794..ea0f65b3f 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp @@ -14,7 +14,7 @@ UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu( // success or fail ui.OverrideSFX(m_iPad, ACTION_MENU_A, true); ui.OverrideSFX(m_iPad, ACTION_MENU_OK, true); -#ifdef __ORBIS__ +#if 0 ui.OverrideSFX(m_iPad, ACTION_MENU_TOUCHPAD_PRESS, true); #endif ui.OverrideSFX(m_iPad, ACTION_MENU_X, true); @@ -58,7 +58,7 @@ void UIScene_AbstractContainerMenu::handleDestroy() { ui.OverrideSFX(m_iPad, ACTION_MENU_A, false); ui.OverrideSFX(m_iPad, ACTION_MENU_OK, false); -#ifdef __ORBIS__ +#if 0 ui.OverrideSFX(m_iPad, ACTION_MENU_TOUCHPAD_PRESS, false); #endif ui.OverrideSFX(m_iPad, ACTION_MENU_X, false); @@ -113,7 +113,7 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, m_fPanelMinY = fPanelY; m_fPanelMaxY = fPanelY + fPanelHeight; -#ifdef __ORBIS__ +#if 0 // we need to map the touchpad rectangle to the UI rectangle. While it works // great for the creative menu, it is much too sensitive for the smaller // menus. @@ -193,7 +193,7 @@ void UIScene_AbstractContainerMenu::tick() { IggyMakeEventMouseMove(&mouseEvent, x, y); // 4J Stu - This seems to be broken on Durango, so do it ourself -#ifdef _DURANGO +#if 0 // mouseEvent.x = x; // mouseEvent.y = y; #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp index 5b4692fe8..8d044a023 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp @@ -309,7 +309,7 @@ int UIScene_AnvilMenu::KeyboardCompleteCallback(void* lpParam, bool bRes) { void UIScene_AnvilMenu::handleEditNamePressed() { setIgnoreInput(true); -#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ +#if 0 || 0 || 0 int language = XGetLanguage(); switch (language) { case XC_LANGUAGE_JAPANESE: @@ -379,13 +379,13 @@ void UIScene_AnvilMenu::showCross(bool show) { } void UIScene_AnvilMenu::handleDestroy() { -#ifdef __PSVITA__ +#if 0 app.DebugPrintf("missing InputManager.DestroyKeyboard on Vita !!!!!!\n"); #endif // another player destroyed the anvil, so shut down the keyboard if it is // displayed -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO) +#if (0 || 0 || 0) InputManager.DestroyKeyboard(); #endif UIScene_AbstractContainerMenu::handleDestroy(); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp index a1d03ba7e..a764e1c34 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp @@ -63,7 +63,7 @@ void UIScene_ConnectingProgress::tick() { Minecraft* pMinecraft = Minecraft::GetInstance(); pMinecraft->removeLocalPlayerIdx(m_iPad); -#ifdef _XBOX_ONE +#if 0 ProfileManager.RemoveGamepadFromGame(m_iPad); #endif } @@ -130,7 +130,7 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id) { exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL; break; -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 case DisconnectPacket::eDisconnect_ContentRestricted_AllLocal: exitReasonStringId = IDS_CONTENT_RESTRICTION_MULTIPLAYER; break; @@ -138,7 +138,7 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id) { exitReasonStringId = IDS_CONTENT_RESTRICTION; break; #endif -#ifdef _XBOX +#if 0 case DisconnectPacket::eDisconnect_NoUGC_Remote: exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE; @@ -156,7 +156,7 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id) { case DisconnectPacket::eDisconnect_OutdatedClient: exitReasonStringId = IDS_DISCONNECTED_CLIENT_OLD; break; -#if defined __ORBIS__ || defined __PS3__ || defined __PSVITA__ +#if 0 || 0 || 0 case DisconnectPacket::eDisconnect_NATMismatch: exitReasonStringId = IDS_DISCONNECTED_NAT_TYPE_MISMATCH; break; @@ -219,7 +219,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, // } // break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.h b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.h index ec510643b..9942fbe71 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.h @@ -44,7 +44,7 @@ protected: // TODO: This should be pure virtual in this class virtual std::wstring getMoviePath(); -#ifdef _DURANGO +#if 0 virtual long long getDefaultGtcButtons() { return 0; } #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp index 1939d20e6..5aaeed8fe 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp @@ -13,15 +13,15 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, IggyDataValue result; IggyDataValue value[1]; value[0].type = IGGY_DATATYPE_number; -#if defined(_XBOX) || defined(_WIN64) +#if 0 || defined(_WIN64) value[0].number = (F64)0; -#elif defined(_DURANGO) +#elif 0 value[0].number = (F64)1; -#elif defined(__PS3__) +#elif 0 value[0].number = (F64)2; -#elif defined(__ORBIS__) +#elif 0 value[0].number = (F64)3; -#elif defined(__PSVITA__) +#elif 0 value[0].number = (F64)4; #endif IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, @@ -44,8 +44,8 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, !bNotInGame && Minecraft::GetInstance()->localplayers[m_iPad] && Minecraft::GetInstance()->localplayers[m_iPad]->abilities.mayfly; -#ifndef __PSVITA__ -#ifdef __ORBIS__ +#if 1 +#if 0 // no buttons to initialise if we're running this on PS4 remote play if (!InputManager.UsingRemoteVita()) #endif @@ -69,11 +69,11 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, int iSelected = app.GetGameSettings(m_iPad, eGameSetting_ControlScheme); -#ifndef __PSVITA__ +#if 1 LPWSTR layoutString = new wchar_t[128]; swprintf(layoutString, 128, L"%ls : %ls", app.GetString(IDS_CURRENT_LAYOUT), app.GetString(m_iSchemeTextA[iSelected])); -#ifdef __ORBIS__ +#if 0 if (!InputManager.UsingRemoteVita()) #endif { @@ -83,7 +83,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, m_iCurrentNavigatedControlsLayout = iSelected; -#ifdef __ORBIS__ +#if 0 // don't set controller layout if we're entering the PS4 remote play scene if (!InputManager.UsingRemoteVita()) #endif @@ -97,10 +97,10 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, m_funcSetControllerLayout, 1, value); } -#ifdef __ORBIS__ +#if 0 // Set mapping to Vita mapping if (InputManager.UsingRemoteVita()) m_iCurrentNavigatedControlsLayout = 3; -#elif defined __PSVITA__ +#elif 0 // Set mapping to Vita mapping if (InputManager.IsVitaTV()) m_iCurrentNavigatedControlsLayout = 1; #endif @@ -115,12 +115,12 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, } std::wstring UIScene_ControlsMenu::getMoviePath() { -#ifdef __ORBIS__ +#if 0 if (InputManager.UsingRemoteVita()) { return L"ControlsRemotePlay"; } else #endif -#ifdef __PSVITA__ +#if 0 if (InputManager.IsVitaTV()) { return L"ControlsTV"; } else @@ -157,7 +157,7 @@ void UIScene_ControlsMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { @@ -201,7 +201,7 @@ void UIScene_ControlsMenu::handlePress(F64 controlId, F64 childId) { swprintf(layoutString, 128, L"%ls : %ls", app.GetString(IDS_CURRENT_LAYOUT), app.GetString(m_iSchemeTextA[control])); -#ifdef __ORBIS__ +#if 0 if (!InputManager.UsingRemoteVita()) #endif { @@ -268,7 +268,7 @@ void UIScene_ControlsMenu::PositionAllText(int iPad) { } bool layoutHasDpadFly; -#ifdef __PSVITA__ +#if 0 layoutHasDpadFly = m_iCurrentNavigatedControlsLayout == 1; #else layoutHasDpadFly = m_iCurrentNavigatedControlsLayout == 0; @@ -296,7 +296,7 @@ void UIScene_ControlsMenu::PositionText(int iPad, int iTextID, if (uiVal & _360_JOY_BUTTON_Y) PositionTextDirect(iPad, iTextID, e_PadY, true); if (uiVal & _360_JOY_BUTTON_BACK) { -#ifdef __ORBIS__ +#if 0 PositionTextDirect( iPad, iTextID, (InputManager.UsingRemoteVita() ? e_PadTouch : e_PadBack), true); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h index 9e411d380..bbdf555f4 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h @@ -51,8 +51,8 @@ private: IggyName m_funcSetPlatform, m_funcSetControllerLayout; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) -#ifndef __PSVITA__ -#ifdef __ORBIS__ +#if 1 +#if 0 if (!InputManager.UsingRemoteVita()) #endif { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp index f486bea1e..69f947f3e 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp @@ -5,7 +5,7 @@ #include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" #include "UIScene_CraftingMenu.h" -#ifdef __PSVITA__ +#if 0 #define GAME_CRAFTING_TOUCHUPDATE_TIMER_ID 0 #define GAME_CRAFTING_TOUCHUPDATE_TIMER_TIME 100 #endif @@ -164,7 +164,7 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, // success or fail ui.OverrideSFX(m_iPad, ACTION_MENU_A, true); ui.OverrideSFX(m_iPad, ACTION_MENU_OK, true); -#ifdef __ORBIS__ +#if 0 ui.OverrideSFX(m_iPad, ACTION_MENU_TOUCHPAD_PRESS, true); #endif ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT_SCROLL, true); @@ -178,7 +178,7 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, // CheckRecipesAvailable UpdateTooltips(); -#ifdef __PSVITA__ +#if 0 // initialise vita touch controls with ids for (unsigned int i = 0; i < ETouchInput_Count; ++i) { m_TouchInput[i].init(i); @@ -210,7 +210,7 @@ void UIScene_CraftingMenu::handleDestroy() { ui.OverrideSFX(m_iPad, ACTION_MENU_A, false); ui.OverrideSFX(m_iPad, ACTION_MENU_OK, false); -#ifdef __ORBIS__ +#if 0 ui.OverrideSFX(m_iPad, ACTION_MENU_TOUCHPAD_PRESS, false); #endif ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT_SCROLL, false); @@ -246,7 +246,7 @@ std::wstring UIScene_CraftingMenu::getMoviePath() { } } -#ifdef __PSVITA__ +#if 0 UIControl* UIScene_CraftingMenu::GetMainPanel() { return &m_controlMainPanel; } void UIScene_CraftingMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.h index 4b304d064..21b5f826b 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.h @@ -63,7 +63,7 @@ public: virtual void customDraw(IggyCustomDrawCallbackRegion* region); -#ifdef __PSVITA__ +#if 0 virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); virtual UIControl* GetMainPanel(); @@ -88,7 +88,7 @@ protected: IggyName m_funcMoveSelector, m_funcSelectVerticalItem, m_funcSetActiveTab; IggyName m_funcShowPanelDisplay, m_funcShowIngredientSlot; -#ifdef __PSVITA__ +#if 0 enum ETouchInput { ETouchInput_TouchPanel_0, ETouchInput_TouchPanel_1, @@ -158,7 +158,7 @@ protected: UI_MAP_NAME(m_funcShowPanelDisplay, L"showPanelDisplay") UI_MAP_NAME(m_funcShowIngredientSlot, L"ShowIngredient") -#ifdef __PSVITA__ +#if 0 UI_MAP_ELEMENT(m_TouchInput[ETouchInput_TouchPanel_0], "TouchPanel_0") UI_MAP_ELEMENT(m_TouchInput[ETouchInput_TouchPanel_1], "TouchPanel_1") UI_MAP_ELEMENT(m_TouchInput[ETouchInput_TouchPanel_2], "TouchPanel_2") diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp index e4c68e6fc..ace2d19f8 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp @@ -12,7 +12,7 @@ #include "../../Minecraft.World/Level/Storage/LevelType.h" #include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" -#ifdef __PSVITA__ +#if 0 #endif #ifdef _WINDOWS64 @@ -100,7 +100,7 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, // PS3 when we are a restricted child account It'll fail when we choose // create, but this matches the behaviour of load game, and lets the player // know why they can't play online, instead of just greying out the online - // setting in the More Options #ifdef __PS3__ + // setting in the More Options #ifdef 0 // if(ProfileManager.IsSignedInLive( m_iPad )) // { // ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&bChatRestricted,&bContentRestricted,NULL); @@ -263,12 +263,12 @@ UIControl* UIScene_CreateWorldMenu::GetMainPanel() { } void UIScene_CreateWorldMenu::handleDestroy() { -#ifdef __PSVITA__ +#if 0 app.DebugPrintf("missing InputManager.DestroyKeyboard on Vita !!!!!!\n"); #endif // shut down the keyboard if it is displayed -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO) +#if (0 || 0 || 0) InputManager.DestroyKeyboard(); #endif } @@ -287,7 +287,7 @@ void UIScene_CreateWorldMenu::tick() { m_bShowTexturePackDescription = false; } -#ifdef __ORBIS__ +#if 0 // check the status of the PSPlus common dialog switch (sceNpCommerceDialogUpdateStatus()) { case SCE_COMMON_DIALOG_STATUS_FINISHED: { @@ -319,7 +319,7 @@ void UIScene_CreateWorldMenu::tick() { #endif } -#ifdef __ORBIS__ +#if 0 int UIScene_CreateWorldMenu::ContinueOffline( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam; @@ -349,17 +349,17 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif // 4J-JEV: Inform user why their game must be offline. -#if defined _XBOX_ONE +#if 0 if (pressed && controlHasFocus(m_checkboxOnline.getId()) && !m_checkboxOnline.IsEnabled()) { unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad); } #endif @@ -426,7 +426,7 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId) { UpdateCurrentTexturePack((int)childId); } break; case eControl_NewWorld: { -#ifdef _DURANGO +#if 0 if (m_MoreOptionsParams.bOnlineGame) { m_bIgnoreInput = true; ProfileManager.CheckMultiplayerPrivileges( @@ -441,7 +441,7 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId) { } } -#ifdef _DURANGO +#if 0 void UIScene_CreateWorldMenu::checkPrivilegeCallback(void* lpParam, bool hasPrivilege, int iPad) { @@ -541,13 +541,13 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { { // need to be signed in to live ui.RequestMessageBox(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1); m_bIgnoreInput = false; + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); m_bIgnoreInput = false; return; } else */ { // upsell -#ifdef _XBOX +#if 0 DLC_INFO* pDLCInfo = app.GetDLCInfoForTrialOfferID( m_pDLCPack->getPurchaseOfferId()); ULONGLONG ullOfferID_Full; @@ -566,7 +566,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { ullOfferID_Full & 0xFFFFFFFF); #endif -#if defined(_DURANGO) || defined(_WINDOWS64) +#if 0 || defined(_WINDOWS64) // trial pack warning unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -574,7 +574,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { IDS_USING_TRIAL_TEXUREPACK_WARNING, uiIDA, 1, m_iPad, &TrialTexturePackWarningReturned, this); -#elif defined __PS3__ || defined __ORBIS__ || defined(__PSVITA__) +#elif 0 || 0 || 0 // trial pack warning unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; @@ -585,14 +585,14 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { &TrialTexturePackWarningReturned, this); #endif -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 StorageManager.SetSaveDisabled(true); #endif return; } } } -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 app.SetGameHostOption(eGameHostOption_DisableSaving, m_MoreOptionsParams.bDisableSaving ? 1 : 0); StorageManager.SetSaveDisabled(m_MoreOptionsParams.bDisableSaving); @@ -617,7 +617,7 @@ void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue) { } void UIScene_CreateWorldMenu::handleTimerComplete(int id) { -#ifdef __PSVITA__ +#if 0 // we cannot rebuild touch boxes in an iggy callback because it requires // further iggy calls if (m_bRebuildTouchBoxes) { @@ -662,7 +662,7 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id) { } } break; // 4J-PB - Only Xbox will not have trial DLC patched into the game -#ifdef _XBOX +#if 0 case CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID: { // also check for any new texture packs info being available // for each item in the mem list, check it's in the data list @@ -753,7 +753,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame() { // If this is an online game but not all players are signed in to Live, // stop! if (isOnlineGame && !isSignedInLive) { -#ifdef __ORBIS__ +#if 0 assert(iPadNotSignedInLive != -1); // Check if PSN is unavailable because of age restriction @@ -781,7 +781,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame() { } return; /* 4J-PB - Add this after release -#elif defined __PSVITA__ +#elif 0 m_bIgnoreInput=false; // Determine why they're not "signed in live" if @@ -810,7 +810,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); return; #endif } -#ifdef __ORBIS__ +#if 0 bool bPlayStationPlus = true; int iPadWithNoPlaystationPlus = 0; @@ -903,7 +903,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); return; ProfileManager.AllowedPlayerCreatedContent( ProfileManager.GetPrimaryPad(), false, &pccAllowed, &pccFriendsAllowed); -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 if (isOnlineGame && isSignedInLive) { ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), false, NULL, @@ -925,7 +925,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); return; m_bIgnoreInput = false; ui.RequestContentRestrictedMessageBox(); } -#ifdef __ORBIS__ +#if 0 else if (bPlayStationPlus == false) { m_bIgnoreInput = false; @@ -984,7 +984,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); return; m_bIgnoreInput = false; ui.RequestContentRestrictedMessageBox(); } -#ifdef __ORBIS__ +#if 0 else if (isOnlineGame && isSignedInLive && (bPlayStationPlus == false)) { m_bIgnoreInput = false; @@ -1026,7 +1026,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); return; } #endif else { -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 if (isOnlineGame) { bool chatRestricted = false; ProfileManager.GetChatAndContentRestrictions( @@ -1059,14 +1059,14 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame; -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode()) { if (SQRNetworkManager_AdHoc_Vita:: GetAdhocStatus()) // && // pClass->m_MoreOptionsParams.bOnlineGame) isClientSide = true; } -#endif // __PSVITA__ +#endif // 0 bool isPrivate = pClass->m_MoreOptionsParams.bInviteOnly ? true : false; @@ -1237,7 +1237,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, param->hellScale = HELL_LEVEL_MAX_SCALE; #endif -#ifndef _XBOX +#if 1 g_NetworkManager.FakeLocalPlayerJoined(); #endif @@ -1300,7 +1300,7 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void* pParam, // If this is an online game but not all players are signed in to // Live, stop! if (isOnlineGame && !isSignedInLive) { -#ifdef __ORBIS__ +#if 0 assert(iPadNotSignedInLive != -1); // Check if PSN is unavailable because of age restriction @@ -1431,7 +1431,7 @@ int UIScene_CreateWorldMenu::ConfirmCreateReturned( IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA, 1, ProfileManager.GetPrimaryPad()); } else { -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 bool isOnlineGame = ProfileManager.IsSignedInLive( ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame; @@ -1456,7 +1456,7 @@ int UIScene_CreateWorldMenu::ConfirmCreateReturned( return 0; } -#ifdef __ORBIS__ +#if 0 int UIScene_CreateWorldMenu::MustSignInReturnedPSN( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h index 53ac3e4c5..14ec250d0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h @@ -80,7 +80,7 @@ private: void StartSharedLaunchFlow(); bool IsLocalMultiplayerAvailable(); -#ifdef _DURANGO +#if 0 static void checkPrivilegeCallback(void* lpParam, bool hasPrivilege, int iPad); #endif @@ -98,7 +98,7 @@ protected: static int MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result); -#ifdef __ORBIS__ +#if 0 // static int PSPlusReturned(void *pParam,int // iPad,C4JStorage::EMessageResult result); static int ContinueOffline(void* pParam, int iPad, diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp index 80ff2e379..8d48c5fc1 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp @@ -9,7 +9,7 @@ #include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" #include "../../Minecraft.World/Headers/net.minecraft.world.item.h" -#ifdef __PSVITA__ +#if 0 #define GAME_CREATIVE_TOUCHUPDATE_TIMER_ID 0 #define GAME_CREATIVE_TOUCHUPDATE_TIMER_TIME 100 #endif @@ -59,7 +59,7 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void* _initData, m_curTab = eCreativeInventoryTab_COUNT; switchTab(eCreativeInventoryTab_BuildingBlocks); -#ifdef __PSVITA__ +#if 0 // initialise vita touch controls with ids for (unsigned int i = 0; i < ETouchInput_Count; ++i) { m_TouchInput[i].init(i); @@ -75,7 +75,7 @@ std::wstring UIScene_CreativeMenu::getMoviePath() { } } -#ifdef __PSVITA__ +#if 0 UIControl* UIScene_CreativeMenu::GetMainPanel() { return &m_controlMainPanel; } void UIScene_CreativeMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.h index 91a60d133..6d715b422 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.h @@ -28,7 +28,7 @@ protected: ETouchInput_Count, }; -#ifdef __PSVITA__ +#if 0 // 4J - TomK - this only needs to be a touch component on vita! UIControl_Touch m_TouchInput[ETouchInput_Count]; #else @@ -77,7 +77,7 @@ public: virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled); -#ifdef __PSVITA__ +#if 0 virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); virtual UIControl* GetMainPanel(); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp index 40abc21af..9651a7694 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp @@ -85,13 +85,13 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {L"Harry Gordon", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Thomas Kronberg", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -#ifdef _XBOX +#if 0 {L"Ian le Bruce", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Andy West", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Gordon McLean", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, #endif -#ifdef __PSVITA__ +#if 0 // 4J-PB - Aaron didn't want to be in the credits { L"Aaron Puzey", // NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText // }, @@ -101,11 +101,11 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {L"%ls", IDS_CREDITS_ART, NO_TRANSLATED_STRING, eLargeText}, {L"David Keningale", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -#ifdef _XBOX +#if 0 {L"Pat McGovern", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, #endif {L"Alan Redmond", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -#ifdef _XBOX +#if 0 {L"Julian Laing", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Caitlin Goodale", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, @@ -116,7 +116,7 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {L"Chris Reeves", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Kate Wright", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Michael Hansen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -#ifdef _XBOX +#if 0 {L"Kate Flavell", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, #endif {L"Donald Robertson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, @@ -130,7 +130,7 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {L"%ls", IDS_CREDITS_QA, NO_TRANSLATED_STRING, eLargeText}, {L"Steven Gary Woodward", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -#ifdef _XBOX +#if 0 {L"Richard Black", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, #endif {L"George Vaughan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, @@ -142,21 +142,21 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {L"Roni Percy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Anne Clarke", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Anthony Kent", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -#ifdef _XBOX +#if 0 // credits are in the XUI file -#elif defined(__PS3__) +#elif 0 // font credits {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line {L"%ls", IDS_DYNAFONT, NO_TRANSLATED_STRING, eLargeText}, -#elif defined(__ORBIS__) +#elif 0 // font credits {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line {L"%ls", IDS_DYNAFONT, NO_TRANSLATED_STRING, eLargeText}, -#elif defined(_DURANGO) +#elif 0 {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, @@ -638,7 +638,7 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { NO_TRANSLATED_STRING, eSmallText}, #elif defined(_WIN64) -#elif defined(__PSVITA__) +#elif 0 // font credits {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line @@ -646,14 +646,14 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { #endif -#ifndef _XBOX +#if 1 // Miles & Iggy credits {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line {L"", CREDIT_ICON, eCreditIcon_Iggy, eSmallText}, // extra blank line {L"Uses Iggy.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line -#ifdef __PS3__ +#if 0 {L"Copyright (C) 2009-2013 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line #else @@ -665,14 +665,14 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {L"", CREDIT_ICON, eCreditIcon_Miles, eSmallText}, // extra blank line {L"Uses Miles Sound System.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line -#ifdef __PS3__ +#if 0 {L"Copyright (C) 1991-2013 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line #else {L"Copyright (C) 1991-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line #endif -#ifdef __PS3__ +#if 0 {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line {L"", CREDIT_ICON, eCreditIcon_Dolby, eSmallText}, // extra blank line @@ -821,7 +821,7 @@ void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.h b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.h index 1e5cefbd7..d96b5e9d1 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.h @@ -10,18 +10,18 @@ #define DYNAMODE_FONT_CREDITS_COUNT 2 #define PS3_DOLBY_CREDIT 4 -#ifdef __PS3__ +#if 0 #define MAX_CREDIT_STRINGS \ (PS3_CREDITS_COUNT + MILES_AND_IGGY_CREDITS_COUNT + \ DYNAMODE_FONT_CREDITS_COUNT + PS3_DOLBY_CREDIT) -#elif defined(__ORBIS__) +#elif 0 #define MAX_CREDIT_STRINGS \ (PS4_CREDITS_COUNT + MILES_AND_IGGY_CREDITS_COUNT + \ DYNAMODE_FONT_CREDITS_COUNT) -#elif defined(_DURANGO) || defined _WINDOWS64 || defined __linux__ +#elif 0 || defined _WINDOWS64 || defined __linux__ #define MAX_CREDIT_STRINGS \ (XBOXONE_CREDITS_COUNT + MILES_AND_IGGY_CREDITS_COUNT) -#elif defined(__PSVITA__) +#elif 0 #define MAX_CREDIT_STRINGS \ (PSVITA_CREDITS_COUNT + MILES_AND_IGGY_CREDITS_COUNT + \ DYNAMODE_FONT_CREDITS_COUNT) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp index 21a743982..9624bb7d0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp @@ -1,6 +1,6 @@ #include "../../Minecraft.World/Platform/stdafx.h" #include "UI.h" -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 #include "../Network/Sony/SonyCommerce.h" #endif #include "UIScene_DLCMainMenu.h" @@ -19,12 +19,12 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void* initData, m_labelOffers.init(IDS_DOWNLOADABLE_CONTENT_OFFERS); m_buttonListOffers.init(eControl_OffersList); -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 // load any local DLC images app.LoadLocalDLCImages(); #endif -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // show a timer on this menu m_Timer.setVisible(true); @@ -32,14 +32,10 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void* initData, #endif if (m_loadedResolution == eSceneResolution_1080) { -#ifdef _DURANGO - m_labelXboxStore.init(IDS_XBOX_STORE); -#else m_labelXboxStore.init(L""); -#endif } -#if defined(_DURANGO) +#if 0 m_Timer.setVisible(false); m_buttonListOffers.addItem(IDS_DLC_MENU_SKINPACKS, e_DLC_SkinPack); @@ -54,11 +50,11 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void* initData, TelemetryManager->RecordMenuShown(iPad, eUIScene_DLCMainMenu, 0); -#if defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 app.GetCommerce()->ShowPsStoreIcon(); #endif -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (0 || 0 || 0) addTimer(PLAYER_ONLINE_TIMER_ID, PLAYER_ONLINE_TIMER_TIME); #endif } @@ -67,11 +63,11 @@ UIScene_DLCMainMenu::~UIScene_DLCMainMenu() { // Alert the app the we no longer want to be informed of ethernet // connections app.SetLiveLinkRequired(false); -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 app.FreeLocalDLCImages(); #endif -#ifdef _XBOX_ONE +#if 0 // 4J-JEV: Have to switch back to user preferred languge now. setLanguageOverride(true); #endif @@ -94,14 +90,14 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -#if defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 app.GetCommerce()->HidePsStoreIcon(); #endif navigateBack(); } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); @@ -129,7 +125,7 @@ void UIScene_DLCMainMenu::handlePress(F64 controlId, F64 childId) { // Xbox One will have requested the marketplace content - there is // only that type -#ifndef _XBOX_ONE +#if 1 app.AddDLCRequest((eDLCMarketplaceType)iIndex, true); #endif killTimer(PLAYER_ONLINE_TIMER_ID); @@ -140,7 +136,7 @@ void UIScene_DLCMainMenu::handlePress(F64 controlId, F64 childId) { } void UIScene_DLCMainMenu::handleTimerComplete(int id) { -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (0 || 0 || 0) switch (id) { case PLAYER_ONLINE_TIMER_ID: #ifndef _WINDOWS64 @@ -168,7 +164,7 @@ int UIScene_DLCMainMenu::ExitDLCMainMenu(void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_DLCMainMenu* pClass = (UIScene_DLCMainMenu*)pParam; -#if defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 app.GetCommerce()->HidePsStoreIcon(); #endif pClass->navigateBack(); @@ -183,7 +179,7 @@ void UIScene_DLCMainMenu::handleGainFocus(bool navBack) { if (navBack) { // add the timer back in -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (0 || 0 || 0) addTimer(PLAYER_ONLINE_TIMER_ID, PLAYER_ONLINE_TIMER_TIME); #endif } @@ -192,7 +188,7 @@ void UIScene_DLCMainMenu::handleGainFocus(bool navBack) { void UIScene_DLCMainMenu::tick() { UIScene::tick(); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if ((m_bCategoriesShown == false) && (app.GetCommerceCategoriesRetrieved())) { // disable the timer display on this menu @@ -218,13 +214,13 @@ void UIScene_DLCMainMenu::tick() { if (pCategories->countOfSubCategories > 0) { m_buttonListOffers.setFocus(true); } else { -#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__ +#if 0 || 0 || 0 app.CheckForEmptyStore(ProfileManager.GetPrimaryPad()); #endif // need to display text to say no downloadable content available yet m_labelOffers.setLabel(app.GetString(IDS_NO_DLCCATEGORIES)); -#ifdef __ORBIS__ +#if 0 // 4J-JEV: TRC Requirement (R4055), need to display this system // message. ProfileManager.DisplaySystemMessage( @@ -234,4 +230,4 @@ void UIScene_DLCMainMenu::tick() { } } #endif -} \ No newline at end of file +} diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.h index 66c747dad..2062ebdd9 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.h @@ -23,7 +23,7 @@ private: static int ExitDLCMainMenu(void* pParam, int iPad, C4JStorage::EMessageResult result); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 bool m_bCategoriesShown; #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp index 7eef0d067..9091e416c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp @@ -2,11 +2,11 @@ #include "UI.h" #include "UIScene_DLCOffersMenu.h" #include "../../../../Minecraft.World/Util/StringHelpers.h" -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 #include "Common/Network/Sony/SonyHttp.h" #endif -#ifdef __PSVITA__ +#if 0 #include "PSVita/Network/SonyCommerce_Vita.h" #endif @@ -21,7 +21,7 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void* initData, m_iProductInfoIndex = param->iType; m_iCurrentDLC = 0; m_iTotalDLC = 0; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 m_pvProductInfo = NULL; #endif m_bAddAllDLCButtons = true; @@ -43,14 +43,10 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void* initData, m_bIsSelected = false; if (m_loadedResolution == eSceneResolution_1080) { -#ifdef _DURANGO - m_labelXboxStore.init(app.GetString(IDS_XBOX_STORE)); -#else m_labelXboxStore.init(L""); -#endif } -#ifdef _DURANGO +#if 0 m_pNoImageFor_DLC = NULL; // If we don't yet have this DLC, we need to display a timer m_bDLCRequiredIsRetrieved = false; @@ -61,15 +57,15 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void* initData, #endif -#ifdef __ORBIS__ +#if 0 // sceNpCommerceShowPsStoreIcon(SCE_NP_COMMERCE_PS_STORE_ICON_CENTER); #endif -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (0 || 0 || 0) addTimer(PLAYER_ONLINE_TIMER_ID, PLAYER_ONLINE_TIMER_TIME); #endif -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif } @@ -81,7 +77,7 @@ UIScene_DLCOffersMenu::~UIScene_DLCOffersMenu() { } void UIScene_DLCOffersMenu::handleTimerComplete(int id) { -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (0 || 0 || 0) switch (id) { case PLAYER_ONLINE_TIMER_ID: #ifndef _WINDOWS64 @@ -109,7 +105,7 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_DLCOffersMenu* pClass = (UIScene_DLCOffersMenu*)pParam; -#if defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 app.GetCommerce()->HidePsStoreIcon(); #endif ui.NavigateToHomeMenu(); // iPad,eUIScene_MainMenu); @@ -146,7 +142,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); @@ -237,7 +233,7 @@ AB"); break; void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_OffersList: { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // buy the DLC std::vector::iterator it = @@ -249,7 +245,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId) { SonyCommerce::ProductInfo info = *it; -#ifdef __PS3__ +#if 0 // is the item purchasable? if (info.purchasabilityFlag == 1) { // can be bought @@ -262,7 +258,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId) { app.DownloadAlreadyPurchased(info.skuId); } } -#else // __ORBIS__ +#else // 0 // is the item purchasable? if (info.purchasabilityFlag == SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED) { @@ -271,8 +267,8 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId) { } else { app.DownloadAlreadyPurchased(info.skuId); } -#endif // __PS3__ -#elif defined _XBOX_ONE +#endif // 0 +#elif 0 int iIndex = (int)childId; StorageManager.InstallOffer( 1, StorageManager.GetOffer(iIndex).wszProductID, NULL, NULL); @@ -292,7 +288,7 @@ void UIScene_DLCOffersMenu::handleSelectionChanged(F64 selectedId) {} void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId) { app.DebugPrintf("UIScene_DLCOffersMenu::handleFocusChange\n"); -#ifdef __PSVITA__ +#if 0 // set this here on Vita, in case we've came from a touch screen press. // Fixes bug #5794 if ((int)controlId == eControl_OffersList) { @@ -301,7 +297,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId) { } #endif -#ifdef _DURANGO +#if 0 m_bSelectionChanged = true; // to tell the tick to update the display // 4J-PB can't call settexturename from a callback /*if(m_buttonListOffers.hasFocus() && (childId>-1)) @@ -312,7 +308,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId) { }*/ #endif -#if defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 if (m_pvProductInfo) { m_bIsSelected = true; std::vector::iterator it = @@ -337,7 +333,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId) { void UIScene_DLCOffersMenu::tick() { UIScene::tick(); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (m_bAddAllDLCButtons) { // need to fill out all the dlc buttons @@ -377,7 +373,7 @@ void UIScene_DLCOffersMenu::tick() { bool bDLCIsAvailable = false; -#ifdef __PS3__ +#if 0 // is the item purchasable? if (info.purchasabilityFlag == 1) { // can be bought @@ -396,7 +392,7 @@ void UIScene_DLCOffersMenu::tick() { bDLCIsAvailable = true; } } -#else // __ORBIS__ +#else // 0 // is the item purchasable? if (info.purchasabilityFlag == SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED) { @@ -407,7 +403,7 @@ void UIScene_DLCOffersMenu::tick() { m_buttonListOffers.addItem(teststring, true, i); bDLCIsAvailable = true; } -#endif // __PS3__ +#endif // 0 // set the other details for the first item if (bDLCIsAvailable && (bFirstItemSet == false)) { @@ -438,7 +434,7 @@ void UIScene_DLCOffersMenu::tick() { PBYTE pbImageData; int iImageDataBytes = 0; bool bDeleteData; -#ifdef __ORBIS__ +#if 0 // check the local files first SONYDLC* pSONYDLCInfo = app.GetSONYDLCInfoFromKeyname(info.productId); @@ -495,7 +491,7 @@ void UIScene_DLCOffersMenu::tick() { m_bProductInfoShown = true; } } else { -#ifdef __PSVITA__ +#if 0 // MGH - fixes bug 5768 on Vita - should be extended properly to work // for other platforms if ((SonyCommerce_Vita::getPurchasabilityUpdated()) && @@ -559,7 +555,7 @@ void UIScene_DLCOffersMenu::tick() { PBYTE pbImageData; int iImageDataBytes = 0; bool bDeleteData; -#ifdef __ORBIS__ +#if 0 // check the local files first SONYDLC* pSONYDLCInfo = app.GetSONYDLCInfoFromKeyname(info.productId); @@ -595,7 +591,7 @@ void UIScene_DLCOffersMenu::tick() { m_Timer.setVisible(false); } } -#elif defined _XBOX_ONE +#elif 0 if (m_bAddAllDLCButtons) { // Is the DLC we're looking for available? if (!m_bDLCRequiredIsRetrieved) { @@ -665,7 +661,7 @@ void UIScene_DLCOffersMenu::tick() { #endif } -#if defined _XBOX_ONE +#if 0 void UIScene_DLCOffersMenu::GetDLCInfo(int iOfferC, bool bUpdateOnly) { MARKETPLACE_CONTENTOFFER_INFO xOffer; int iCount = 0; @@ -722,7 +718,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo(int iOfferC, bool bUpdateOnly) { wstrTemp = &pwchNewName[10]; } -#ifdef _XBOX_ONE +#if 0 // 4J-PB - the hasPurchased comes from the local installed // package info find the DLC in the installed packages XCONTENT_DATA* pContentData = @@ -794,7 +790,7 @@ void UIScene_DLCOffersMenu::UpdateTooltips( bool UIScene_DLCOffersMenu::UpdateDisplay( MARKETPLACE_CONTENTOFFER_INFO& xOffer) { bool bImageAvailable = false; -#ifdef _XBOX_ONE +#if 0 DLC_INFO* dlc = app.GetDLCInfoForFullOfferID(xOffer.wszProductID); #else DLC_INFO* dlc = app.GetDLCInfoForFullOfferID(xOffer.wszOfferName); @@ -832,7 +828,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay( DWORD dwSize = 0; app.GetMemFileDetails(cString, &pData, &dwSize); // set the image -#ifdef _XBOX_ONE +#if 0 registerSubstitutionTexture(cString, pData, dwSize); #else registerSubstitutionTexture(cString, pData, dwSize, true); @@ -863,16 +859,16 @@ bool UIScene_DLCOffersMenu::UpdateDisplay( } #endif -#ifdef _XBOX_ONE +#if 0 void UIScene_DLCOffersMenu::HandleDLCLicenseChange() { // flag an update of the display int iOfferC = app.GetDLCOffersCount(); GetDLCInfo(iOfferC, false); } -#endif // _XBOX_ONE +#endif // 0 -#ifdef __PS3__ +#if 0 void UIScene_DLCOffersMenu::HandleDLCInstalled() { app.DebugPrintf(4, "UIScene_DLCOffersMenu::HandleDLCInstalled\n"); @@ -886,4 +882,4 @@ void UIScene_DLCOffersMenu::HandleDLCInstalled() { // app.DebugPrintf(4,"UIScene_SkinSelectMenu::HandleDLCMountingComplete\n"); //} -#endif \ No newline at end of file +#endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.h index 65a0b14ae..6382f198b 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.h @@ -52,16 +52,16 @@ public: virtual void handleSelectionChanged(F64 selectedId); virtual void handleFocusChange(F64 controlId, F64 childId); virtual void handleTimerComplete(int id); -#ifdef __PS3__ +#if 0 virtual void HandleDLCInstalled(); #endif -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange(); #endif private: -#ifdef _DURANGO +#if 0 void GetDLCInfo(int iOfferC, bool bUpdateOnly = false); void UpdateTooltips(MARKETPLACE_CONTENTOFFER_INFO& xOffer); bool UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer); @@ -87,7 +87,7 @@ private: int m_iCurrentDLC; int m_iTotalDLC; bool m_bAddAllDLCButtons; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 std::vector* m_pvProductInfo; #endif }; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.cpp index 88fca6502..25b268a38 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.cpp @@ -63,7 +63,7 @@ void UIScene_DeathMenu::handleInput(int iPad, int key, bool repeat, handled = true; break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: @@ -79,7 +79,7 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId) { case eControl_Respawn: m_bIgnoreInput = true; app.SetAction(m_iPad, eAppAction_Respawn); -#ifdef _DURANGO +#if 0 // InputManager.SetEnabledGtcButtons(_360_GTC_MENU|_360_GTC_PAUSE|_360_GTC_VIEW); #endif break; @@ -101,7 +101,7 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId) { TelemetryManager->RecordLevelExit( m_iPad, eSen_LevelExitStatus_Failed); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 if (g_NetworkManager.IsHost() && StorageManager.GetSaveDisabled()) { uiIDA[0] = IDS_CONFIRM_CANCEL; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.h index 30dc2cbe9..167d25526 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.h @@ -34,7 +34,7 @@ public: protected: void handlePress(F64 controlId, F64 childId); -#ifdef _DURANGO +#if 0 virtual long long getDefaultGtcButtons() { return 0; } #endif }; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_EULA.cpp index 05ecd3278..e19134a21 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_EULA.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_EULA.cpp @@ -13,11 +13,11 @@ UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) m_buttonConfirm.init(app.GetString(IDS_TOOLTIPS_ACCEPT), eControl_Confirm); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 std::wstring EULA = app.GetString(IDS_EULA); EULA.append(L"\r\n"); -#if defined(__PS3__) +#if 0 if (app.IsEuropeanSKU()) { EULA.append(app.GetString(IDS_EULA_SCEE)); // if it's the BD build @@ -27,7 +27,7 @@ UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) } else if (app.IsAmericanSKU()) { EULA.append(app.GetString(IDS_EULA_SCEA)); } -#elif defined __ORBIS__ +#elif 0 if (app.IsEuropeanSKU()) { EULA.append(app.GetString(IDS_EULA_SCEE)); // 4J-PB - we can't tell if it's a disc or digital version, so let's @@ -69,7 +69,7 @@ UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) // ui.setFontCachingCalculationBuffer(20000); -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif } @@ -89,7 +89,7 @@ void UIScene_EULA::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled) { if (m_bIgnoreInput) return; -#ifdef __ORBIS__ +#if 0 // ignore all players except player 0 - it's their profile that is currently // being used if (iPad != 0) return; @@ -98,7 +98,7 @@ void UIScene_EULA::handleInput(int iPad, int key, bool repeat, bool pressed, ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); switch (key) { -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_OK: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_EULA.h b/Minecraft.Client/Platform/Common/UI/UIScene_EULA.h index befafc5f4..9b478d37b 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_EULA.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_EULA.h @@ -24,7 +24,7 @@ public: virtual EUIScene getSceneType() { return eUIScene_EULA; } // Returns true if this scene has focus for the pad passed in -#ifndef __PS3__ +#if 1 virtual bool hasFocus(int iPad) { return bHasFocus; } #endif virtual void updateTooltips(); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp index 3c33ac874..9e5ddba3d 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp @@ -70,11 +70,11 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, thread->Run(); threadStarted = true; -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(false); #endif } @@ -198,7 +198,7 @@ void UIScene_FullscreenProgress::tick() { m_buttonConfirm.setVisible(true); // 4J-TomK - rebuild touch after confirm button made visible // again -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif updateTooltips(); @@ -287,7 +287,7 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HUD.h b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.h index 30fc32963..51d9d1760 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HUD.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.h @@ -178,7 +178,7 @@ public: protected: void handleTimerComplete(int id); -#ifdef _DURANGO +#if 0 virtual long long getDefaultGtcButtons() { return _360_GTC_PAUSE | _360_GTC_MENU | _360_GTC_VIEW; } diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp index ad5cacd96..f5418af59 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp @@ -33,7 +33,7 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, removeControl(&m_buttons[BUTTON_HAO_DEBUG], false); #endif -#ifdef _XBOX_ONE +#if 0 // 4J-PB - in order to buy the skin packs, we need the signed offer ids for // them, which we get in the availability info we need to retrieve this info // though, so do it here @@ -178,7 +178,7 @@ void UIScene_HelpAndOptionsMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif // CD - Added for audio diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp index a18b42fd0..b6a339480 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp @@ -49,7 +49,7 @@ static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[eHowToPlay_NumPages] = {IDS_HOW_TO_PLAY_DROPPERS, 0, 0}, // eHowToPlay_Droppers {IDS_HOW_TO_PLAY_NETHERPORTAL, 0, 0}, // eHowToPlay_NetherPortal {IDS_HOW_TO_PLAY_THEEND, 0, 0}, // eHowToPlay_NetherPortal -#ifdef _XBOX +#if 0 {IDS_HOW_TO_PLAY_SOCIALMEDIA, 0, 0}, // eHowToPlay_SocialMedia {IDS_HOW_TO_PLAY_BANLIST, 0, 0}, // eHowToPlay_BanList #endif @@ -86,7 +86,7 @@ int gs_pageToFlashMapping[eHowToPlay_NumPages] = { 16, // eHowToPlay_NetherPortal, 17, // eHowToPlay_TheEnd, -#ifdef _XBOX +#if 0 18, // eHowToPlay_SocialMedia, 19, // eHowToPlay_BanList, #endif @@ -228,7 +228,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_A: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { @@ -292,7 +292,7 @@ void UIScene_HowToPlay::StartPage(EHowToPlayPage ePage) { // replaceAll(replacedText,L"{*TITLE_UPDATE_NAME*}",app.GetString(IDS_TITLE_UPDATE_NAME)); replacedText = replaceAll(replacedText, L"{*KICK_PLAYER_DESCRIPTION*}", app.GetString(IDS_KICK_PLAYER_DESCRIPTION)); -#ifdef _XBOX_ONE +#if 0 replacedText = replaceAll(replacedText, L"{*PLATFORM_NAME*}", app.GetString(IDS_PLATFORM_NAME)); #endif @@ -363,7 +363,7 @@ void UIScene_HowToPlay::StartPage(EHowToPlayPage ePage) { TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, (ETelemetry_HowToPlay_SubMenuId)ePage); -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif } diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp index 291e01c6b..7ba49fba0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp @@ -28,7 +28,7 @@ unsigned int UIScene_HowToPlayMenu::m_uiHTPButtonNameA[] = { IDS_HOW_TO_PLAY_MENU_NETHERPORTAL, // eHTPButton_NetherPortal, IDS_HOW_TO_PLAY_MENU_THEEND, // eHTPButton_TheEnd, -#ifdef _XBOX +#if 0 IDS_HOW_TO_PLAY_MENU_SOCIALMEDIA, // eHTPButton_SocialMedia, IDS_HOW_TO_PLAY_MENU_BANLIST, // eHTPButton_BanningLevels, #endif @@ -52,7 +52,7 @@ unsigned int UIScene_HowToPlayMenu::m_uiHTPSceneA[] = { eHowToPlay_Droppers, eHowToPlay_NetherPortal, eHowToPlay_TheEnd, -#ifdef _XBOX +#if 0 eHowToPlay_SocialMedia, eHowToPlay_BanList, #endif eHowToPlay_HostOptions, @@ -150,7 +150,7 @@ void UIScene_HowToPlayMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.h index b25d5ff79..1bd99c96a 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.h @@ -32,7 +32,7 @@ private: eHTPButton_Droppers, eHTPButton_NetherPortal, eHTPButton_TheEnd, -#ifdef _XBOX +#if 0 eHTPButton_SocialMedia, eHTPButton_BanningLevels, #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp index a37dddc18..958c4cf48 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp @@ -164,7 +164,7 @@ void UIScene_InGameHostOptionsMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp index f34c4afae..a0a1e9655 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp @@ -88,7 +88,7 @@ void UIScene_InGameInfoMenu::updateTooltips() { } if (g_NetworkManager.IsLocalGame()) keyX = -1; -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode()) keyX = -1; #endif @@ -127,7 +127,7 @@ void UIScene_InGameInfoMenu::updateTooltips() { } } -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 if (m_iPad == ProfileManager.GetPrimaryPad()) ikeyY = IDS_TOOLTIPS_GAME_INVITES; #else @@ -246,9 +246,9 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_Y: -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 if (pressed && iPad == ProfileManager.GetPrimaryPad()) { -#ifdef __PS3__ +#if 0 // are we offline? if (!ProfileManager.IsSignedInLive(iPad)) { // get them to sign in to online @@ -262,9 +262,9 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, } else #endif { -#ifdef __ORBIS__ +#if 0 SQRNetworkManager_Orbis::RecvInviteGUI(); -#else // __PS3__ +#else // 0 int ret = sceNpBasicRecvMessageCustom( SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE, SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE, @@ -285,7 +285,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, if (player != NULL) { PlayerUID uid = player->GetUID(); if (uid != INVALID_XUID) { -#ifdef __PSVITA__ +#if 0 PSVITA_STUBBED; #else ProfileManager.ShowProfileCard(iPad, uid); @@ -299,7 +299,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, case ACTION_MENU_X: if (pressed && !repeat && !g_NetworkManager.IsLocalGame()) { -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode() == false) g_NetworkManager.SendInviteGUI(iPad); #else @@ -309,7 +309,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: @@ -517,16 +517,16 @@ UIScene_InGameInfoMenu::PlayerInfo* UIScene_InGameInfoMenu::BuildPlayerInfo( return info; } -#if defined __PS3__ || defined __PSVITA__ +#if 0 || 0 int UIScene_InGameInfoMenu::MustSignInReturnedPSN( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_InGameInfoMenu* pClass = (UIScene_InGameInfoMenu*)pParam; if (result == C4JStorage::EMessage_ResultAccept) { -#ifdef __PS3__ +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn( &UIScene_InGameInfoMenu::ViewInvites_SignInReturned, pClass); -#else // __PSVITA__ +#else // 0 SQRNetworkManager_Vita::AttemptPSNSignIn( &UIScene_InGameInfoMenu::ViewInvites_SignInReturned, pClass); #endif @@ -541,16 +541,16 @@ int UIScene_InGameInfoMenu::ViewInvites_SignInReturned(void* pParam, if (bContinue == true) { // Check if we're signed in to LIVE if (ProfileManager.IsSignedInLive(iPad)) { -#ifdef __ORBIS__ +#if 0 SQRNetworkManager_Orbis::RecvInviteGUI(); -#elif defined(__PS3__) +#elif 0 int ret = sceNpBasicRecvMessageCustom( SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE, SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE, SYS_MEMORY_CONTAINER_ID_INVALID); app.DebugPrintf("sceNpBasicRecvMessageCustom return %d ( %08x )\n", ret, ret); -#else // __PSVITA__ +#else // 0 SQRNetworkManager_Vita::RecvInviteGUI(); #endif } diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h index cbabbf5ed..876128c96 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h @@ -69,7 +69,7 @@ public: private: PlayerInfo* BuildPlayerInfo(INetworkPlayer* player); -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 static int MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result); static int ViewInvites_SignInReturned(void* pParam, bool bContinue, diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp index b8cd7d5b3..e20037da0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp @@ -280,7 +280,7 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( g_NetworkManager.RegisterPlayerChangedCallback( m_iPad, &UIScene_InGamePlayerOptionsMenu::OnPlayerChanged, this); -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif } @@ -548,7 +548,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp index db4032095..ca181d64a 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIScene_InGameSaveManagementMenu.h" -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 #include #endif @@ -59,7 +59,7 @@ UIScene_InGameSaveManagementMenu::UIScene_InGameSaveManagementMenu( m_labelSavesListTitle.init(app.GetString(IDS_SAVE_INCOMPLETE_DELETE_SAVES)); m_controlSavesTimer.setVisible(true); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 m_spaceIndicatorSaves.init(L"", eControl_SpaceIndicator, 0, (4LL * 1024LL * 1024LL * 1024LL)); #endif @@ -74,8 +74,8 @@ UIScene_InGameSaveManagementMenu::UIScene_InGameSaveManagementMenu( m_saveDetails = NULL; m_iSaveDetailsCount = 0; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) || \ - defined(_DURANGO) +#if 0 || 0 || 0 || \ + 0 // Always clear the saves when we enter this menu StorageManager.ClearSavesInfo(); #endif @@ -90,7 +90,7 @@ UIScene_InGameSaveManagementMenu::UIScene_InGameSaveManagementMenu( Initialise(); } -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { g_NetworkManager @@ -214,14 +214,14 @@ void UIScene_InGameSaveManagementMenu::tick() { m_iSaveDetailsCount = m_pSaveDetails->iSaveC; for (unsigned int i = 0; i < m_pSaveDetails->iSaveC; ++i) { -#if defined(_XBOX_ONE) +#if 0 m_spaceIndicatorSaves.addSave( m_pSaveDetails->SaveInfoA[i].totalSize); -#elif defined(__ORBIS__) +#elif 0 m_spaceIndicatorSaves.addSave( m_pSaveDetails->SaveInfoA[i].blocksUsed * (32 * 1024)); #endif -#ifdef _DURANGO +#if 0 m_buttonListSaves.addItem( m_pSaveDetails->SaveInfoA[i].UTF16SaveTitle, L""); @@ -274,7 +274,7 @@ void UIScene_InGameSaveManagementMenu::tick() { if (!m_bExitScene) { // convert to utf16 std::uint16_t u16Message[MAX_SAVEFILENAME_LENGTH]; -#ifdef _DURANGO +#if 0 // Already utf16 on durango memcpy( u16Message, @@ -293,17 +293,13 @@ void UIScene_InGameSaveManagementMenu::tick() { MAX_SAVEFILENAME_LENGTH // size of destination buffer, in // WCHAR's ); -#else -#ifdef __PS3 - size_t srcmax, dstmax; #else uint32_t srcmax, dstmax; uint32_t srclen, dstlen; -#endif srcmax = MAX_SAVEFILENAME_LENGTH; dstmax = MAX_SAVEFILENAME_LENGTH; -#if defined(__PS3__) +#if 0 L10nResult lres = UTF8stoUTF16s( (uint8_t*)m_saveDetails[m_iRequestingThumbnailId] .UTF8SaveFilename, @@ -410,7 +406,7 @@ void UIScene_InGameSaveManagementMenu::handleInput(int iPad, int key, switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 m_bExitScene = true; #else navigateBack(); @@ -419,7 +415,7 @@ void UIScene_InGameSaveManagementMenu::handleInput(int iPad, int key, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.h index 3710fb096..6118502ce 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.h @@ -8,7 +8,7 @@ class UIScene_InGameSaveManagementMenu : public UIScene { private: enum EControls { eControl_SavesList, -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 eControl_SpaceIndicator, #endif }; @@ -28,7 +28,7 @@ protected: UIControl_SaveList m_buttonListSaves; UIControl_Label m_labelSavesListTitle; UIControl m_controlSavesTimer; -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 UIControl_SpaceIndicatorBar m_spaceIndicatorSaves; #endif @@ -40,7 +40,7 @@ private: UI_MAP_ELEMENT(m_controlSavesTimer, "SavesTimer") -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 UI_MAP_ELEMENT(m_spaceIndicatorSaves, "SaveSizeBar") #endif UI_END_MAP_ELEMENTS_AND_NAMES() diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp index 3cd6b1296..5b0281b43 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp @@ -18,27 +18,27 @@ UIScene_Intro::UIScene_Intro(int iPad, void* initData, UILayer* parentLayer) bool bSkipESRB = false; bool bChina = false; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 bSkipESRB = app.GetProductSKU() != e_sku_SCEA; -#elif defined(_XBOX) || defined(_DURANGO) +#elif 0 || 0 bSkipESRB = !ProfileManager.LocaleIsUSorCanada(); #endif -#ifdef _DURANGO +#if 0 bChina = ProfileManager.LocaleIsChina(); #endif // 4J Stu - These map to values in the Actionscript #if defined(_WINDOWS64) || defined(__linux__) int platformIdx = 0; -#elif defined(_XBOX) +#elif 0 int platformIdx = 1; -#elif defined(_DURANGO) +#elif 0 int platformIdx = 2; -#elif defined(__PS3__) +#elif 0 int platformIdx = 3; -#elif defined(__ORBIS__) +#elif 0 int platformIdx = 4; -#elif defined(__PSVITA__) +#elif 0 int platformIdx = 5; #endif @@ -57,7 +57,7 @@ UIScene_Intro::UIScene_Intro(int iPad, void* initData, UILayer* parentLayer) IggyPlayerRootPath(getMovie()), m_funcSetIntroPlatform, 3, value); -#ifdef __PSVITA__ +#if 0 // initialise vita touch controls with ids m_TouchToSkip.init(0); #endif @@ -71,13 +71,13 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, switch (key) { case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (!m_bIgnoreNavigate) { m_bIgnoreNavigate = true; // ui.NavigateToHomeMenu(); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // has the user seen the EULA already ? We need their options // file loaded for this @@ -98,7 +98,7 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, ui.NavigateToScene(0, eUIScene_EULA); break; } -#elif defined _XBOX_ONE +#elif 0 ui.NavigateToScene(0, eUIScene_MainMenu); #else ui.NavigateToScene(0, eUIScene_SaveMessage); @@ -108,7 +108,7 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, } } -#ifdef __PSVITA__ +#if 0 void UIScene_Intro::handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased) { @@ -123,7 +123,7 @@ void UIScene_Intro::handleAnimationEnd() { if (!m_bIgnoreNavigate) { m_bIgnoreNavigate = true; // ui.NavigateToHomeMenu(); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // has the user seen the EULA already ? We need their options file // loaded for this C4JStorage::eOptionsCallback eStatus = app.GetOptionsCallbackStatus(0); @@ -142,7 +142,7 @@ void UIScene_Intro::handleAnimationEnd() { break; } -#elif defined _XBOX_ONE +#elif 0 // Don't navigate to the main menu if we don't have focus, as we could // have the quadrant sign-in or a join game timer screen running, and // then when Those finish they'll give the main menu focus which clears diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h index 3f5bb0c32..1018b241c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h @@ -8,11 +8,11 @@ private: bool m_bAnimationEnded; IggyName m_funcSetIntroPlatform; -#ifdef __PSVITA__ +#if 0 UIControl_Touch m_TouchToSkip; #endif UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) -#ifdef __PSVITA__ +#if 0 UI_MAP_ELEMENT(m_TouchToSkip, "TouchToSkip") #endif UI_MAP_NAME(m_funcSetIntroPlatform, L"SetIntroPlatform") @@ -24,14 +24,14 @@ public: virtual EUIScene getSceneType() { return eUIScene_Intro; } // Returns true if this scene has focus for the pad passed in -#ifndef __PS3__ +#if 1 virtual bool hasFocus(int iPad) { return bHasFocus; } #endif protected: virtual std::wstring getMoviePath(); -#ifdef _DURANGO +#if 0 virtual long long getDefaultGtcButtons() { return 0; } #endif @@ -43,7 +43,7 @@ public: virtual void handleAnimationEnd(); virtual void handleGainFocus(bool navBack); -#ifdef __PSVITA__ +#if 0 virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp index cf30a50a2..a74c4e69c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp @@ -28,7 +28,7 @@ void UIScene_JoinMenu::updateTooltips() { int iA = -1; int iY = -1; if (getControlFocus() == eControl_GamePlayers) { -#ifdef _DURANGO +#if 0 iY = IDS_TOOLTIPS_VIEW_GAMERCARD; #endif } else { @@ -53,7 +53,7 @@ void UIScene_JoinMenu::tick() { m_buttonListPlayers.init(eControl_GamePlayers); -#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ +#if 0 || 0 || 0 for (int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++) { if (m_selectedSession->data.players[i] != NULL) { #ifndef _CONTENT_PACKAGE @@ -67,7 +67,7 @@ void UIScene_JoinMenu::tick() { std::string playerName( m_selectedSession->data.players[i].getOnlineID()); -#ifndef __PSVITA__ +#if 1 // Append guest number (any players in an online game not // signed into PSN are guests) if (m_selectedSession->data.players[i].isSignedIntoPSN() == @@ -87,7 +87,7 @@ void UIScene_JoinMenu::tick() { break; } } -#elif defined(_DURANGO) +#elif 0 for (int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++) { if (m_selectedSession->searchResult.m_playerNames[i].size()) { m_buttonListPlayers.addItem( @@ -238,7 +238,7 @@ void UIScene_JoinMenu::tick() { // network manager so this is the best we can do unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; -#ifdef _XBOX_ONE +#if 0 ui.RequestErrorMessage(IDS_CONNECTION_FAILED, IDS_DISCONNECTED_SERVER_QUIT, uiIDA, 1, m_iPad, ErrorDialogReturned, this); @@ -289,7 +289,7 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed, handled = true; } break; -#ifdef _DURANGO +#if 0 case ACTION_MENU_Y: if (m_selectedSession != NULL && getControlFocus() == eControl_GamePlayers && @@ -308,7 +308,7 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed, } handled = true; break; -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: @@ -329,7 +329,7 @@ void UIScene_JoinMenu::handlePress(F64 controlId, F64 childId) { // CD - Added for audio ui.PlayUISFX(eSFX_Press); -#ifdef _DURANGO +#if 0 ProfileManager.CheckMultiplayerPrivileges( m_iPad, true, &checkPrivilegeCallback, this); #else @@ -349,7 +349,7 @@ void UIScene_JoinMenu::handleFocusChange(F64 controlId, F64 childId) { updateTooltips(); } -#ifdef _DURANGO +#if 0 void UIScene_JoinMenu::checkPrivilegeCallback(void* lpParam, bool hasPrivilege, int iPad) { UIScene_JoinMenu* pClass = (UIScene_JoinMenu*)lpParam; @@ -440,7 +440,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { isSignedInLive = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()); -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) isSignedInLive = true; @@ -451,7 +451,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { // If this is an online game but not all players are signed in to Live, // stop! if (!isSignedInLive) { -#ifdef __ORBIS__ +#if 0 // Check if PSN is unavailable because of age restriction int npAvailability = ProfileManager.getNPAvailability(iPadNotSignedInLive); @@ -484,7 +484,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { bool pccAllowed = true; bool pccFriendsAllowed = true; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 if (isSignedInLive) { ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), false, &noUGC, NULL, NULL); @@ -495,7 +495,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { if (!pccAllowed && !pccFriendsAllowed) noUGC = true; #endif -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode()) { noPrivileges = false; noUGC = false; @@ -520,7 +520,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); } else { -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 bool chatRestricted = false; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), false, &chatRestricted, NULL, NULL); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h index de990e556..142464ea3 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h @@ -84,7 +84,7 @@ protected: void StartSharedLaunchFlow(); -#ifdef _DURANGO +#if 0 static void checkPrivilegeCallback(void* lpParam, bool hasPrivilege, int iPad); #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.h b/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.h index 1f47733ba..3f55f47de 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.h @@ -73,7 +73,7 @@ public: // Returns true if this scene has focus for the pad passed in // virtual bool hasFocus(int iPad) { return false; } // Returns true if this scene has focus for the pad passed in -#ifndef __PS3__ +#if 1 virtual bool hasFocus(int iPad) { return bHasFocus; } #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp index 14242072c..0b0954340 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp @@ -89,7 +89,7 @@ void UIScene_LanguageSelector::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.h b/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.h index 4fd1a8097..28533a138 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.h @@ -16,7 +16,7 @@ #define HAS_LANGUAGE_KO_KR(exp) exp, #define HAS_LANGUAGE_CN_TW(exp) exp, -#ifdef _DURANGO +#if 0 #define HAS_LANGUAGE_CN_CN(exp) exp, #define HAS_LANGUAGE_SK_SK(exp) exp, #define HAS_LANGUAGE_CZ_CZ(exp) exp, @@ -35,7 +35,7 @@ #define HAS_LANGUAGE_NB_NO(exp) exp, #define HAS_LANGUAGE_EL_GR(exp) exp, -#if defined(__ORBIS__) || defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 || 0 #define HAS_LANGUAGE_TR_TR(exp) exp, #else #define HAS_LANGUAGE_TR_TR(exp) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp index 448acff95..be5dd4c34 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp @@ -171,7 +171,7 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( // Only the Xbox 360 needs a reset nether // 4J-PB - PS3 needs it now - // #ifndef _XBOX + // #ifndef 0 // if(!m_params->bGenerateOptions) removeControl( // &m_checkboxes[eLaunchCheckbox_ResetNether], false ); #endif @@ -204,7 +204,7 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( addTimer(GAME_CREATE_ONLINE_TIMER_ID, GAME_CREATE_ONLINE_TIMER_TIME); -#ifdef __PSVITA__ +#if 0 // initialise vita tab controls with ids m_TouchTabWorld.init(ETouchInput_TabWorld); m_TouchTabGame.init(ETouchInput_TabGame); @@ -279,12 +279,12 @@ void UIScene_LaunchMoreOptionsMenu::tick() { } void UIScene_LaunchMoreOptionsMenu::handleDestroy() { -#ifdef __PSVITA__ +#if 0 app.DebugPrintf("missing InputManager.DestroyKeyboard on Vita !!!!!!\n"); #endif // so shut down the keyboard if it is displayed -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO) +#if (0 || 0 || 0) InputManager.DestroyKeyboard(); #endif } @@ -307,11 +307,11 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif // 4J-JEV: Inform user why their game must be offline. -#if defined _XBOX_ONE +#if 0 { UIControl_CheckBox* checkboxOnline = &m_checkboxes[eLaunchCheckbox_Online]; @@ -319,7 +319,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, !checkboxOnline->IsEnabled()) { unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad); } } @@ -351,7 +351,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, } } -#ifdef __PSVITA__ +#if 0 void UIScene_LaunchMoreOptionsMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, @@ -592,7 +592,7 @@ int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(void* lpParam, pClass->m_bIgnoreInput = false; // 4J HEG - No reason to set value if keyboard was cancelled if (bRes) { -#ifdef __PSVITA__ +#if 0 // CD - Changed to 2048 [SCE_IME_MAX_TEXT_LENGTH] uint16_t pchText[2048]; ZeroMemory(pchText, 2048 * sizeof(uint16_t)); @@ -613,7 +613,7 @@ void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_EditSeed: { m_bIgnoreInput = true; -#ifdef __PS3__ +#if 0 int language = XGetLanguage(); switch (language) { case XC_LANGUAGE_JAPANESE: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.h index ca6ec1526..4efa4e351 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.h @@ -41,7 +41,7 @@ private: eControl_Count }; -#ifdef __PSVITA__ +#if 0 enum ETouchInput { ETouchInput_TabWorld = eControl_Count, ETouchInput_TabGame, @@ -68,7 +68,7 @@ private: UI_MAP_ELEMENT(m_gameOptions, "GameOptions") UI_BEGIN_MAP_CHILD_ELEMENTS(m_gameOptions) -#ifdef __PSVITA__ +#if 0 UI_MAP_ELEMENT(m_TouchTabGame, "TouchTabGame") #endif UI_MAP_ELEMENT(m_labelDescription_GameOptions, "Description_GameOptions") @@ -96,7 +96,7 @@ private: UI_MAP_ELEMENT(m_worldOptions, "WorldOptions") UI_BEGIN_MAP_CHILD_ELEMENTS(m_worldOptions) -#ifdef __PSVITA__ +#if 0 UI_MAP_ELEMENT(m_TouchTabWorld, "TouchTabWorld") #endif UI_MAP_ELEMENT(m_labelDescription_WorldOptions, "Description_WorldOptions") @@ -174,9 +174,9 @@ private: bool m_bUpdateOnline; // If true, update online settings on next tick void UpdateOnline(); -#ifdef __PSVITA__ +#if 0 virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); virtual UIControl* GetMainPanel(); -#endif //__PSVITA__ +#endif //0 }; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp index 1563973d0..e4f276797 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp @@ -113,7 +113,7 @@ UIScene_LeaderboardsMenu::UIScene_LeaderboardsMenu(int iPad, void* initData, ReadStats(-1); -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (0 || 0 || 0) addTimer(PLAYER_ONLINE_TIMER_ID, PLAYER_ONLINE_TIMER_TIME); #endif } @@ -128,7 +128,7 @@ void UIScene_LeaderboardsMenu::updateTooltips() { int iTooltipFriendRequest = -1; int iTooltipGamerCardOrProfile = -1; -#ifdef _DURANGO +#if 0 // if( m_leaderboard.m_entries.size() > 0 ) if (m_leaderboard.m_totalEntryCount > 0) { unsigned int selection = m_newSel; @@ -147,7 +147,7 @@ void UIScene_LeaderboardsMenu::updateTooltips() { } else { iTooltipGamerCardOrProfile = IDS_TOOLTIPS_VIEW_GAMERCARD; -#ifdef _XBOX +#if 0 // if we're on the friends filter, then don't show the Send Friend // Request if (!m_currentFilter == LeaderboardManager::eFM_Friends) @@ -158,7 +158,7 @@ void UIScene_LeaderboardsMenu::updateTooltips() { if (selection >= GetEntryStartIndex() && selection < (GetEntryStartIndex() + m_leaderboard.m_entries.size())) { -#ifdef _XBOX +#if 0 if ((m_leaderboard .m_entries[selection - (m_leaderboard.m_entryStartIndex - @@ -389,7 +389,7 @@ void UIScene_LeaderboardsMenu::handleInput(int iPad, int key, bool repeat, handled = true; } break; case ACTION_MENU_Y: { -#ifdef _DURANGO +#if 0 // Show gamercard // if( m_leaderboard.m_entries.size() > 0 ) if (m_leaderboard.m_totalEntryCount > 0) { @@ -412,10 +412,10 @@ void UIScene_LeaderboardsMenu::handleInput(int iPad, int key, bool repeat, handled = true; } break; case ACTION_MENU_A: { -#ifdef _DURANGO +#if 0 // Send friend request if the filter mode is not friend, and they're // not a friend or a pending friend -#ifdef _XBOX +#if 0 if (m_currentFilter != LeaderboardManager::eFM_Friends) #endif { @@ -429,7 +429,7 @@ void UIScene_LeaderboardsMenu::handleInput(int iPad, int key, bool repeat, if (!m_leaderboard .m_entries[selection - GetEntryStartIndex()] .m_bPlayer -#ifdef _XBOX +#if 0 && !m_leaderboard .m_entries[selection - @@ -634,7 +634,7 @@ bool UIScene_LeaderboardsMenu::RetrieveStats() { if (m_leaderboard.m_totalEntryCount == 0) { m_leaderboard.m_entries.clear(); -#if _DURANGO +#if 0 m_leaderboard.m_totalEntryCount = m_numStats; #else m_leaderboard.m_totalEntryCount = @@ -780,7 +780,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( } } -#ifdef __PS3__ +#if 0 // m_name can be unicode characters somehow for Japan - should use // m_onlineID std::wstring wstr = convStringToWstring(statsRow->m_uid.getOnlineID()); @@ -845,7 +845,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( } } -#ifdef _DURANGO +#if 0 // Is the player PlayerUID myXuid; ProfileManager.GetXUID(ProfileManager.GetPrimaryPad(), &myXuid, true); @@ -860,7 +860,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( leaderboardEntry->m_bFriend = false; leaderboardEntry->m_bRequestedFriend = false; -#ifdef _XBOX +#if 0 // Check for friend status for (unsigned int friendIndex = 0; friendIndex < m_numFriends; ++friendIndex) { @@ -969,7 +969,7 @@ void UIScene_LeaderboardsMenu::PopulateLeaderboard( m_labelEntries.setLabel(entriesBuffer); // Show the no results message -#if !(defined(_XBOX) || \ +#if !(0 || \ defined(_WINDOWS64)) // 4J Stu - Temp to get the win build running, but // so we check this for other platforms if (ret == LeaderboardManager::eStatsReturn_NetworkError) @@ -1049,7 +1049,7 @@ void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up) { } void UIScene_LeaderboardsMenu::handleTimerComplete(int id) { -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (0 || 0 || 0) switch (id) { case PLAYER_ONLINE_TIMER_ID: #ifndef _WINDOWS64 diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp index 1f752e059..88296d0bf 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp @@ -7,18 +7,18 @@ #include "../../Minecraft.Client/MinecraftServer.h" #include "../../Minecraft.World/Level/Storage/LevelSettings.h" #include "../../Minecraft.World/Util/StringHelpers.h" -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 #include "../Network/Sony/SonyHttp.h" #endif #include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 #include #endif #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 // 4J-PB - Only Xbox will not have trial DLC patched into the game -#ifdef _XBOX +#if 0 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 1 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 50 #endif @@ -197,22 +197,22 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_labelCreatedMode.setLabel(app.GetString(IDS_CREATED_IN_SURVIVAL)); } } else { -#if defined(__PS3__) || defined(__ORBIS__) || defined(_DURANGO) || \ - defined(__PSVITA__) +#if 0 || 0 || 0 || \ + 0 // convert to utf16 uint16_t u16Message[MAX_SAVEFILENAME_LENGTH]; size_t srclen, dstlen; srclen = MAX_SAVEFILENAME_LENGTH; dstlen = MAX_SAVEFILENAME_LENGTH; -#ifdef __PS3__ +#if 0 L10nResult lres = UTF8stoUTF16s((uint8_t*)params->saveDetails->UTF8SaveFilename, &srclen, u16Message, &dstlen); -#elif defined(_DURANGO) +#elif 0 // Already utf16 on durango memcpy(u16Message, params->saveDetails->UTF16SaveFilename, MAX_SAVEFILENAME_LENGTH); -#else // __ORBIS__ +#else // 0 { SceCesUcsContext Context; sceCesUcsContextInit(&Context); @@ -231,7 +231,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, app.DebugPrintf("Requesting the save thumbnail\n"); // set the save to load PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); -#ifdef _DURANGO +#if 0 // On Durango, we have an extra flag possible with // LoadSaveDataThumbnail, which if true will force the loading of // this thumbnail even if the save data isn't sync'd from the cloud @@ -251,7 +251,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, #endif m_bShowTimer = true; } -#if defined(_DURANGO) +#if 0 m_labelGameName.init(params->saveDetails->UTF16SaveName); #else wchar_t wSaveName[128]; @@ -295,12 +295,12 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_texturePackList.selectSlot(m_currentTexturePackIndex); // 4J-PB - Only Xbox will not have trial DLC patched into the game -#ifdef _XBOX +#if 0 // 4J-PB - there may be texture packs we don't have, so use the info // from TMS for this // 4J-PB - Any texture packs available that we don't have installed? -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 if (!m_bAvailableTexturePacksChecked && app.GetCommerceProductListRetrieved() && app.GetCommerceProductListInfoRetrieved()) @@ -318,7 +318,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, for (unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i) { bTexturePackAlreadyListed = false; -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 char* pchName = app.GetDLCInfoTextures(i); pDLCInfo = app.GetDLCInfo(pchName); #else @@ -353,7 +353,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, for (unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i) { bTexturePackAlreadyListed = false; -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 char* pchName = app.GetDLCInfoTextures(i); pDLCInfo = app.GetDLCInfo(pchName); #else @@ -381,7 +381,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, #endif } -#ifdef _XBOX +#if 0 addTimer(CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID, CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME); #endif @@ -438,7 +438,7 @@ void UIScene_LoadMenu::tick() { m_pbThumbnailData, m_uiThumbnailSize, (unsigned char*)&szSeed, uiHostOptions, bHostOptionsRead, m_MoreOptionsParams.dwTexturePack); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 sscanf_s(szSeed, "%I64d", &m_seed); #endif @@ -602,7 +602,7 @@ void UIScene_LoadMenu::tick() { eUIScene_QuadrantSignin, &info); } -#ifdef __ORBIS__ +#if 0 // check the status of the PSPlus common dialog switch (sceNpCommerceDialogUpdateStatus()) { case SCE_COMMON_DIALOG_STATUS_FINISHED: { @@ -635,7 +635,7 @@ void UIScene_LoadMenu::tick() { UIScene::tick(); } -#ifdef __ORBIS__ +#if 0 int UIScene_LoadMenu::ContinueOffline(void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam; @@ -665,17 +665,17 @@ void UIScene_LoadMenu::handleInput(int iPad, int key, bool repeat, bool pressed, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif // 4J-JEV: Inform user why their game must be offline. -#if defined _XBOX_ONE +#if 0 if (pressed && controlHasFocus(m_checkboxOnline.getId()) && !m_checkboxOnline.IsEnabled()) { unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad); } #endif @@ -742,7 +742,7 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId) { UpdateCurrentTexturePack((int)childId); } break; case eControl_LoadWorld: { -#ifdef _DURANGO +#if 0 if (m_MoreOptionsParams.bOnlineGame) { m_bIgnoreInput = true; ProfileManager.CheckMultiplayerPrivileges( @@ -756,7 +756,7 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId) { }; } -#ifdef _DURANGO +#if 0 void UIScene_LoadMenu::checkPrivilegeCallback(void* lpParam, bool hasPrivilege, int iPad) { UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)lpParam; @@ -855,13 +855,13 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { { // need to be signed in to live ui.RequestMessageBox(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1); m_bIgnoreInput = false; + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); m_bIgnoreInput = false; return; } else */ { // upsell -#ifdef _XBOX +#if 0 DLC_INFO* pDLCInfo = app.GetDLCInfoForTrialOfferID( m_pDLCPack->getPurchaseOfferId()); ULONGLONG ullOfferID_Full; @@ -880,7 +880,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { ullOfferID_Full & 0xFFFFFFFF); #endif -#if defined(_WINDOWS64) || defined(_DURANGO) +#if defined(_WINDOWS64) || 0 // trial pack warning unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -888,7 +888,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { IDS_USING_TRIAL_TEXUREPACK_WARNING, uiIDA, 1, m_iPad, &TrialTexturePackWarningReturned, this); -#elif defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#elif 0 || 0 || 0 // trial pack warning unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; @@ -899,7 +899,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { &TrialTexturePackWarningReturned, this); #endif -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 StorageManager.SetSaveDisabled(true); #endif return; @@ -908,7 +908,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { } app.SetGameHostOption(eGameHostOption_WasntSaveOwner, (!m_bIsSaveOwner)); -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 app.SetGameHostOption(eGameHostOption_DisableSaving, m_MoreOptionsParams.bDisableSaving ? 1 : 0); StorageManager.SetSaveDisabled(m_MoreOptionsParams.bDisableSaving); @@ -988,7 +988,7 @@ void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue) { void UIScene_LoadMenu::handleTouchBoxRebuild() { m_bRebuildTouchBoxes = true; } void UIScene_LoadMenu::handleTimerComplete(int id) { -#ifdef __PSVITA__ +#if 0 // we cannot rebuild touch boxes in an iggy callback because it requires // further iggy calls if (m_bRebuildTouchBoxes) { @@ -1038,9 +1038,9 @@ void UIScene_LoadMenu::handleTimerComplete(int id) { } } break; // 4J-PB - Only Xbox will not have trial DLC patched into the game -#ifdef _XBOX +#if 0 case CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID: { -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 for (int i = 0; i < m_iTexturePacksNotInstalled; i++) { if (m_iConfigA[i] != -1) { DLC_INFO* pDLCInfo = @@ -1101,7 +1101,7 @@ void UIScene_LoadMenu::LaunchGame(void) { // stop the timer running that causes a check for new texture packs in TMS // but not installed, since this will run all through the load game, and // will crash if it tries to create an hbrush -#ifdef _XBOX +#if 0 killTimer(CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID); #endif @@ -1137,7 +1137,7 @@ void UIScene_LoadMenu::LaunchGame(void) { // set the save to load PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); -#ifndef _DURANGO +#if 1 app.DebugPrintf( "Loading save s [%s]\n", pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex] @@ -1189,7 +1189,7 @@ void UIScene_LoadMenu::LaunchGame(void) { } else { // set the save to load PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); -#ifndef _DURANGO +#if 1 app.DebugPrintf("Loading save %s [%s]\n", pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex] .UTF8SaveTitle, @@ -1250,7 +1250,7 @@ int UIScene_LoadMenu::ConfirmLoadReturned(void* pParam, int iPad, } else { // set the save to load PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); -#ifndef _DURANGO +#if 1 app.DebugPrintf( "Loading save %s [%s]\n", pSaveDetails->SaveInfoA[(int)pClass->m_iSaveGameInfoIndex] @@ -1310,7 +1310,7 @@ int UIScene_LoadMenu::LoadDataComplete(void* pParam) { // If this is an online game but not all players are signed in to Live, // stop! if (isOnlineGame && !isSignedInLive) { -#ifdef __ORBIS__ +#if 0 assert(iPadNotSignedInLive != -1); // Check if PSN is unavailable because of age restriction int npAvailability = @@ -1356,7 +1356,7 @@ int UIScene_LoadMenu::LoadDataComplete(void* pParam) { ProfileManager.AllowedPlayerCreatedContent( ProfileManager.GetPrimaryPad(), false, &pccAllowed, &pccFriendsAllowed); -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 if (isOnlineGame) { ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), false, NULL, @@ -1364,7 +1364,7 @@ int UIScene_LoadMenu::LoadDataComplete(void* pParam) { } #endif -#ifdef __ORBIS__ +#if 0 bool bPlayStationPlus = true; int iPadWithNoPlaystationPlus = 0; for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { @@ -1393,7 +1393,7 @@ int UIScene_LoadMenu::LoadDataComplete(void* pParam) { ui.RequestContentRestrictedMessageBox(); pClass->m_bIgnoreInput = false; } -#ifdef __ORBIS__ +#if 0 else if (isOnlineGame && (bPlayStationPlus == false)) { pClass->setVisible(true); pClass->m_bIgnoreInput = false; @@ -1435,7 +1435,7 @@ int UIScene_LoadMenu::LoadDataComplete(void* pParam) { #endif else { -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 if (isOnlineGame) { bool chatRestricted = false; ProfileManager.GetChatAndContentRestrictions( @@ -1468,7 +1468,7 @@ int UIScene_LoadMenu::LoadDataComplete(void* pParam) { ui.RequestContentRestrictedMessageBox(); pClass->m_bIgnoreInput = false; } -#ifdef __ORBIS__ +#if 0 else if (bPlayStationPlus == false) { pClass->setVisible(true); pClass->m_bIgnoreInput = false; @@ -1535,7 +1535,7 @@ int UIScene_LoadMenu::LoadSaveDataReturned(void* pParam, bool bIsCorrupt, pClass->m_bIsCorrupt = bIsCorrupt; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (app.GetGameHostOption(eGameHostOption_WasntSaveOwner)) { bIsOwner = false; } @@ -1547,7 +1547,7 @@ int UIScene_LoadMenu::LoadSaveDataReturned(void* pParam, bool bIsCorrupt, // messagebox pClass->m_bIgnoreInput = false; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // show the message that trophies are disabled unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -1616,14 +1616,14 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame; -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode()) { if (SQRNetworkManager_AdHoc_Vita:: GetAdhocStatus()) // && // pClass->m_MoreOptionsParams.bOnlineGame) isClientSide = true; } -#endif // __PSVITA__ +#endif // 0 bool isPrivate = (app.GetGameSettings(pClass->m_iPad, eGameSetting_InviteOnly) > 0) @@ -1708,7 +1708,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, param->settings = app.GetGameHostOption(eGameHostOption_All); -#ifndef _XBOX +#if 1 g_NetworkManager.FakeLocalPlayerJoined(); #endif @@ -1783,7 +1783,7 @@ int UIScene_LoadMenu::StartGame_SignInReturned(void* pParam, bool bContinue, // If this is an online game but not all players are signed in to // Live, stop! if (isOnlineGame && !isSignedInLive) { -#ifdef __ORBIS__ +#if 0 assert(iPadNotSignedInLive != -1); // Check if PSN is unavailable because of age restriction @@ -1853,7 +1853,7 @@ int UIScene_LoadMenu::StartGame_SignInReturned(void* pParam, bool bContinue, ProfileManager.GetPrimaryPad()); } } else { -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 if (isOnlineGame) { // show the chat restriction message for all users that it // applies to @@ -1889,7 +1889,7 @@ void UIScene_LoadMenu::handleGainFocus(bool navBack) { } } -#ifdef __ORBIS__ +#if 0 int UIScene_LoadMenu::MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h index ef993b73d..b8d20c40d 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h @@ -60,7 +60,7 @@ private: bool m_bThumbnailGetFailed; int64_t m_seed; -#ifdef __PS3__ +#if 0 std::vector* m_pvProductInfo; #endif // int *m_iConfigA; // track the texture packs that we don't have installed @@ -105,7 +105,7 @@ private: virtual void checkStateAndStartGame(); void LaunchGame(void); -#ifdef _DURANGO +#if 0 static void checkPrivilegeCallback(void* lpParam, bool hasPrivilege, int iPad); #endif @@ -125,7 +125,7 @@ private: static int DeleteSaveDataReturned(void* pParam, bool bSuccess); static int MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result); -#ifdef __ORBIS__ +#if 0 // static int PSPlusReturned(void *pParam,int // iPad,C4JStorage::EMessageResult result); static int ContinueOffline(void* pParam, int iPad, diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp index 0cd5dd009..2a6176faa 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -15,14 +15,14 @@ #include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" #include "../../Minecraft.Client/Textures/Packs/TexturePack.h" #include "../Network/SessionInfo.h" -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 #include "../Network/Sony/SonyHttp.h" #include "../Network/Sony/SonyRemoteStorage.h" #endif -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 #include #endif -#ifdef __PSVITA__ +#if 0 #include "message_dialog.h" #endif @@ -35,12 +35,12 @@ bool UIScene_LoadOrJoinMenu::m_bSaveTransferRunning = false; #define JOIN_LOAD_ONLINE_TIMER_ID 0 #define JOIN_LOAD_ONLINE_TIMER_TIME 100 -#ifdef _XBOX +#if 0 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 3 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 50 #endif -#ifdef _XBOX_ONE +#if 0 UIScene_LoadOrJoinMenu::ESaveTransferFiles UIScene_LoadOrJoinMenu::s_eSaveTransferFile; unsigned long UIScene_LoadOrJoinMenu::s_ulFileSize = 0L; @@ -122,7 +122,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, m_controlSavesTimer.setVisible(true); m_controlJoinTimer.setVisible(true); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 m_spaceIndicatorSaves.init(L"", eControl_SpaceIndicator, 0, (4LL * 1024LL * 1024LL * 1024LL)); #endif @@ -140,7 +140,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, m_bCopying = false; m_bCopyingCancelled = false; -#ifndef _XBOX_ONE +#if 1 m_bSaveTransferCancelled = false; m_bSaveTransferInProgress = false; #endif @@ -149,7 +149,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, m_bMultiplayerAllowed = ProfileManager.IsSignedInLive(m_iPad) && ProfileManager.AllowedToPlayMultiplayer(m_iPad); -#ifdef _XBOX_ONE +#if 0 // 4J-PB - in order to buy the skin packs & texture packs, we need the // signed offer ids for them, which we get in the availability info we need // to retrieve this info though, so do it here @@ -159,7 +159,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, int iLB = -1; -#ifdef _XBOX +#if 0 XPARTY_USER_LIST partyList; if ((XPartyGetUserList(&partyList) != XPARTY_E_NOT_IN_PARTY) && @@ -170,8 +170,8 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, } #endif -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) || \ - defined(_DURANGO) +#if 0 || 0 || 0 || \ + 0 // Always clear the saves when we enter this menu StorageManager.ClearSavesInfo(); #endif @@ -186,7 +186,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, Initialise(); } -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { g_NetworkManager @@ -215,7 +215,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, } // 4J-PB - Only Xbox will not have trial DLC patched into the game -#ifdef _XBOX +#if 0 // 4J-PB - there may be texture packs we don't have, so use the info from // TMS for this @@ -229,7 +229,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, for (unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i) { bTexturePackAlreadyListed = false; -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 char* pchDLCName = app.GetDLCInfoTextures(i); pDLCInfo = app.GetDLCInfo(pchDLCName); #else @@ -259,7 +259,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, for (unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i) { bTexturePackAlreadyListed = false; -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 char* pchDLCName = app.GetDLCInfoTextures(i); pDLCInfo = app.GetDLCInfo(pchDLCName); #else @@ -313,7 +313,7 @@ UIScene_LoadOrJoinMenu::~UIScene_LoadOrJoinMenu() { } void UIScene_LoadOrJoinMenu::updateTooltips() { -#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#if 0 || 0 || 0 if (m_eSaveTransferState != eSaveTransfer_Idle) { // we're in a full screen progress for the save download here, so don't // change the tooltips @@ -356,7 +356,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips() { iLB = IDS_TOOLTIPS_PARTY_GAMES; } -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (m_iPad == ProfileManager.GetPrimaryPad()) iY = IDS_TOOLTIPS_GAME_INVITES; #endif @@ -364,11 +364,11 @@ void UIScene_LoadOrJoinMenu::updateTooltips() { if (ProfileManager.IsFullVersion() == false) { iRB = -1; } else if (StorageManager.GetSaveDisabled()) { -#ifdef _XBOX +#if 0 iX = IDS_TOOLTIPS_SELECTDEVICE; #endif } else { -#if defined _XBOX_ONE +#if 0 if (ProfileManager.IsSignedInLive(m_iPad)) { // Is there a save from 360 on TMS? iX = IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD; @@ -410,7 +410,7 @@ void UIScene_LoadOrJoinMenu::Initialise() { m_pSavesList->SetCurSelVisible(0); #endif } else if (StorageManager.GetSaveDisabled()) { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 GetSaveInfo(); #else @@ -429,7 +429,7 @@ void UIScene_LoadOrJoinMenu::Initialise() { m_controlSavesTimer.setVisible(false); } #endif -#endif // __PS3__ || __ORBIS +#endif // supported save-disabled path } else { // 4J-PB - we need to check that there is enough space left to create a // copy of the save (for a rename) @@ -448,12 +448,12 @@ void UIScene_LoadOrJoinMenu::updateComponents() { } void UIScene_LoadOrJoinMenu::handleDestroy() { -#ifdef __PSVITA__ +#if 0 app.DebugPrintf("missing InputManager.DestroyKeyboard on Vita !!!!!!\n"); #endif // shut down the keyboard if it is displayed -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO) +#if (0 || 0 || 0) InputManager.DestroyKeyboard(); #endif } @@ -531,8 +531,8 @@ std::wstring UIScene_LoadOrJoinMenu::getMoviePath() { void UIScene_LoadOrJoinMenu::tick() { UIScene::tick(); -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined _WINDOWS64 || defined __PSVITA__) +#if (0 || 0 || 0 || \ + defined _WINDOWS64 || 0) if (m_bExitScene) // navigate forward or back { if (!m_bRetrievingSaveThumbnails) { @@ -549,7 +549,7 @@ void UIScene_LoadOrJoinMenu::tick() { if (m_eSaveTransferState == eSaveTransfer_Idle) m_bSaveTransferRunning = false; #endif -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 if (m_bUpdateSaveSize) { if ((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC)) { @@ -566,7 +566,7 @@ void UIScene_LoadOrJoinMenu::tick() { m_pSaveDetails = StorageManager.ReturnSavesInfo(); if (m_pSaveDetails != NULL) { // CD - Fix - Adding define for ORBIS/XBOXONE -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 m_spaceIndicatorSaves.reset(); #endif @@ -586,14 +586,14 @@ void UIScene_LoadOrJoinMenu::tick() { m_iSaveDetailsCount = m_pSaveDetails->iSaveC; for (unsigned int i = 0; i < m_pSaveDetails->iSaveC; ++i) { -#if defined(_XBOX_ONE) +#if 0 m_spaceIndicatorSaves.addSave( m_pSaveDetails->SaveInfoA[i].totalSize); -#elif defined(__ORBIS__) +#elif 0 m_spaceIndicatorSaves.addSave( m_pSaveDetails->SaveInfoA[i].blocksUsed * (32 * 1024)); #endif -#ifdef _DURANGO +#if 0 m_buttonListSaves.addItem( m_pSaveDetails->SaveInfoA[i].UTF16SaveTitle, L""); @@ -647,7 +647,7 @@ void UIScene_LoadOrJoinMenu::tick() { if (!m_bExitScene) { // convert to utf16 std::uint16_t u16Message[MAX_SAVEFILENAME_LENGTH]; -#ifdef _DURANGO +#if 0 // Already utf16 on durango memcpy( u16Message, @@ -666,17 +666,13 @@ void UIScene_LoadOrJoinMenu::tick() { MAX_SAVEFILENAME_LENGTH // size of destination buffer, in // WCHAR's ); -#else -#ifdef __PS3 - size_t srcmax, dstmax; #else std::uint32_t srcmax, dstmax; std::uint32_t srclen, dstlen; -#endif srcmax = MAX_SAVEFILENAME_LENGTH; dstmax = MAX_SAVEFILENAME_LENGTH; -#if defined(__PS3__) +#if 0 L10nResult lres = UTF8stoUTF16s( (std::uint8_t*)m_saveDetails[m_iRequestingThumbnailId] .UTF8SaveFilename, @@ -775,7 +771,7 @@ void UIScene_LoadOrJoinMenu::tick() { } #endif -#ifdef _XBOX_ONE +#if 0 if (g_NetworkManager.ShouldMessageForFullSession()) { unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -785,7 +781,7 @@ void UIScene_LoadOrJoinMenu::tick() { #endif // SAVE TRANSFERS -#ifdef __ORBIS__ +#if 0 // check the status of the PSPlus common dialog switch (sceNpCommerceDialogUpdateStatus()) { case SCE_COMMON_DIALOG_STATUS_FINISHED: { @@ -818,7 +814,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo() { // This will return with the number retrieved in uiSaveC if (app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled()) { -#ifdef __ORBIS__ +#if 0 // We need to make sure this is non-null so that we have an idea of free // space m_pSaveDetails = StorageManager.ReturnSavesInfo(); @@ -829,7 +825,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo() { #endif uiSaveC = 0; -#ifdef _XBOX +#if 0 File savesDir(L"GAME:\\Saves"); #else File savesDir(L"Saves"); @@ -953,7 +949,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 m_bExitScene = true; #else navigateBack(); @@ -974,7 +970,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, ui.PlayUISFX(eSFX_Press); #endif // Save Transfer -#ifdef _XBOX_ONE +#if 0 if (ProfileManager.IsSignedInLive(m_iPad)) { UIScene_LoadOrJoinMenu::s_ulFileSize = 0; LaunchSaveTransfer(); @@ -990,10 +986,10 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, #endif break; case ACTION_MENU_Y: -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 m_eAction = eAction_ViewInvites; if (pressed && iPad == ProfileManager.GetPrimaryPad()) { -#ifdef __ORBIS__ +#if 0 // Check if PSN is unavailable because of age restriction int npAvailability = ProfileManager.getNPAvailability(iPad); if (npAvailability == SCE_NP_ERROR_AGE_RESTRICTION) { @@ -1018,9 +1014,9 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, 2, ProfileManager.GetPrimaryPad(), &UIScene_LoadOrJoinMenu::MustSignInReturnedPSN, this); } else { -#ifdef __ORBIS__ +#if 0 SQRNetworkManager_Orbis::RecvInviteGUI(); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::RecvInviteGUI(); #else int ret = sceNpBasicRecvMessageCustom( @@ -1033,7 +1029,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, #endif } } -#elif defined(_DURANGO) +#elif 0 if (getControlFocus() == eControl_GamesList && m_buttonListGames.getItemCount() > 0) { const int nIndex = m_buttonListGames.getCurrentSelection(); @@ -1046,7 +1042,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, ProfileManager.GetLockedProfile(), uid); ui.PlayUISFX(eSFX_Press); } -#endif // __PS3__ || __ORBIS__ +#endif // 0 || 0 break; case ACTION_MENU_RIGHT_SCROLL: @@ -1083,7 +1079,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, uiIDA[3] = IDS_TOOLTIPS_SAVETRANSFER_UPLOAD; } #endif -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 numOptions = 4; uiIDA[3] = IDS_COPYSAVE; #endif @@ -1133,7 +1129,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_LEFT_SCROLL: -#ifdef _XBOX +#if 0 if (m_bInParty) { m_bShowingPartyGamesOnly = !m_bShowingPartyGamesOnly; UpdateGamesList(); @@ -1155,7 +1151,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: @@ -1180,8 +1176,8 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(void* lpParam, // check the name is valid if (ui16Text[0] != 0) { -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined(__PSVITA__)) +#if (0 || 0 || 0 || \ + 0) // open the save and overwrite the metadata StorageManager.RenameSaveData( pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC, ui16Text, @@ -1276,7 +1272,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId) { eUIScene_LoadMenu, params); } } else { -#ifdef __ORBIS__ +#if 0 // check if this is a damaged save PSAVE_INFO pSaveInfo = &m_pSaveDetails @@ -1319,7 +1315,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId) { params->saveDetails = &m_saveDetails[((int)childId) - m_iDefaultButtonsC]; -#ifdef _XBOX_ONE +#if 0 // On XB1, saves might need syncing, in which case // inform the user so they can decide whether they want // to wait for this to happen @@ -1368,7 +1364,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId) { void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { if (m_buttonListGames.getItemCount() > 0 && gameIndex < m_currentSessions->size()) { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // 4J-PB - is the player allowed to join games? bool noUGC = false; bool bContentRestricted = false; @@ -1377,7 +1373,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { ProfileManager.GetChatAndContentRestrictions(m_iPad, true, &noUGC, &bContentRestricted, NULL); -#ifdef __ORBIS__ +#if 0 // 4J Stu - On PS4 we don't restrict playing multiplayer based on chat // restriction, so remove this check noUGC = false; @@ -1403,7 +1399,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { } } #endif -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode()) { bContentRestricted = false; noUGC = false; @@ -1412,7 +1408,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { if (noUGC) { // not allowed to join -#ifndef __PSVITA__ +#if 1 unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; // Not allowed to play online @@ -1432,7 +1428,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { m_bIgnoreInput = false; return; } -#ifdef __ORBIS__ +#if 0 // If this is an online game but not all players are signed in to Live, // stop! else if (!isSignedInLive) { @@ -1527,7 +1523,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { // upsell the texture pack // tell sentient about the upsell of the full version of the // skin pack -#ifdef _XBOX +#if 0 ULONGLONG ullOfferID_Full; app.GetDLCFullOfferIDForPackID( m_initData->selectedSession->data.texturePackParentId, @@ -1552,7 +1548,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { return; } -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode() && !SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { // not connected to adhoc anymore, must have connected back to @@ -1565,7 +1561,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { } m_controlJoinTimer.setVisible(false); -#ifdef _XBOX +#if 0 // Reset the background downloading, in case we changed it by attempting // to download a texture pack XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO); @@ -1615,7 +1611,7 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions* levelGen) { // pMinecraft->skins->updateUI(); } -#ifndef _XBOX +#if 1 g_NetworkManager.FakeLocalPlayerJoined(); #endif @@ -1826,7 +1822,7 @@ bool UIScene_LoadOrJoinMenu::DoesGamesListHaveFocus() { void UIScene_LoadOrJoinMenu::handleTimerComplete(int id) { switch (id) { case JOIN_LOAD_ONLINE_TIMER_ID: { -#ifdef _XBOX +#if 0 XPARTY_USER_LIST partyList; if ((XPartyGetUserList(&partyList) != XPARTY_E_NOT_IN_PARTY) && @@ -1855,9 +1851,9 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id) { } } break; // 4J-PB - Only Xbox will not have trial DLC patched into the game -#ifdef _XBOX +#if 0 case CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID: { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 for (int i = 0; i < m_iTexturePacksNotInstalled; i++) { if (m_iConfigA[i] != -1) { DLC_INFO* pDLCInfo = @@ -1944,7 +1940,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk( param->settings = app.GetGameHostOption(eGameHostOption_All); param->savePlatform = savePlatform; -#ifndef _XBOX +#if 1 g_NetworkManager.FakeLocalPlayerJoined(); #endif @@ -2011,7 +2007,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud() { param->savePlatform = app.getRemoteStorage()->getSavePlatform(); param->texturePackId = app.getRemoteStorage()->getSaveTexturePack(); -#ifndef _XBOX +#if 1 g_NetworkManager.FakeLocalPlayerJoined(); #endif @@ -2093,7 +2089,7 @@ int UIScene_LoadOrJoinMenu::RenameSaveDataReturned(void* lpParam, bool bRes) { return 0; } -#ifdef __ORBIS__ +#if 0 void UIScene_LoadOrJoinMenu::LoadRemoteFileFromDisk(char* remoteFilename) { wchar_t wSaveName[128]; @@ -2118,7 +2114,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned( case C4JStorage::EMessage_ResultDecline: // rename { pClass->m_bIgnoreInput = true; -#ifdef _DURANGO +#if 0 // bring up a keyboard InputManager.RequestKeyboard( app.GetString(IDS_RENAME_WORLD_TITLE), @@ -2174,7 +2170,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned( pClass); } break; #endif // SONY_REMOTE_STORAGE_UPLOAD -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 case C4JStorage::EMessage_ResultFourthOption: // copy save { unsigned int uiIDA[2]; @@ -2197,7 +2193,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned( return 0; } -#if defined(__PSVITA__) +#if 0 int UIScene_LoadOrJoinMenu::SignInAdhocReturned(void* pParam, bool bContinue, int iPad) { @@ -2250,7 +2246,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void* pParam, memset(chKeyName, 0, sizeof(chKeyName)); strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16); -#ifdef __ORBIS__ +#if 0 strcpy(chName, chKeyName); #else sprintf(chName, "%s-%s", app.GetCommerceCategory(), chKeyName); @@ -2280,9 +2276,9 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned( if (result == C4JStorage::EMessage_ResultAccept) { // we need to enable background downloading for the DLC XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); -#if defined __PSVITA__ || defined __PS3__ || defined __ORBIS__ +#if 0 || 0 || 0 -#ifdef __PSVITA__ +#if 0 if (!ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && CGameNetworkManager::usingAdhocMode()) { // get them to sign in to online @@ -2290,7 +2286,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned( uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT; uiIDA[1] = IDS_PRO_NOTONLINE_DECLINE; ui.RequestAlertMessage( - IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, + IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(), &UIScene_LoadOrJoinMenu::MustSignInTexturePack, pClass); return; @@ -2313,7 +2309,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned( memset(chKeyName, 0, sizeof(chKeyName)); strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16); -#ifdef __ORBIS__ +#if 0 strcpy(chName, chKeyName); #else sprintf(chName, "%s-%s", app.GetCommerceCategory(), chKeyName); @@ -2330,7 +2326,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned( } #endif -#if defined _XBOX_ONE +#if 0 if (ProfileManager.IsSignedIn(iPad)) { if (ProfileManager.IsSignedInLive(iPad)) { std::wstring ProductId; @@ -2347,7 +2343,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned( // Trial to Full texture pack and is not messaged why. unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad); } } @@ -2357,16 +2353,16 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned( return 0; } -#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ +#if 0 || 0 || 0 int UIScene_LoadOrJoinMenu::MustSignInReturnedPSN( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; if (result == C4JStorage::EMessage_ResultAccept) { -#if defined(__PS3__) +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn( &UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::AttemptPSNSignIn( &UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass); #else @@ -2388,7 +2384,7 @@ int UIScene_LoadOrJoinMenu::PSN_SignInReturned(void* pParam, bool bContinue, case eAction_ViewInvites: // Check if we're signed in to LIVE if (ProfileManager.IsSignedInLive(iPad)) { -#if defined(__PS3__) +#if 0 int ret = sceNpBasicRecvMessageCustom( SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE, SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE, @@ -2396,7 +2392,7 @@ int UIScene_LoadOrJoinMenu::PSN_SignInReturned(void* pParam, bool bContinue, app.DebugPrintf( "sceNpBasicRecvMessageCustom return %d ( %08x )\n", ret, ret); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::RecvInviteGUI(); #else SQRNetworkManager_Orbis::RecvInviteGUI(); @@ -2503,7 +2499,7 @@ bool g_bForceVitaSaveWipe = false; int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { m_bSaveTransferRunning = true; -#ifdef __PS3__ +#if 0 StorageManager.SetSaveTransferInProgress(true); #endif Compression::UseDefaultThreadStorage(); @@ -2601,7 +2597,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { ZeroMemory(bTextMetadata, 88); unsigned int hostOptions = app.getRemoteStorage()->getSaveHostOptions(); -#ifdef __ORBIS__ +#if 0 app.SetGameHostOption( hostOptions, eGameHostOption_WorldSize, e_worldSize_Classic); // force the classic world size on, @@ -2739,7 +2735,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { "CrossSaveGetSavesInfoCallback failed - couldn't find " "save\n"); } else { -#ifdef __PS3__ +#if 0 // ignore the CRC on PS3 C4JStorage::ESaveGameState eLoadStatus = StorageManager.LoadSaveData( @@ -2849,7 +2845,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { // that will ultimately delete the directory level storage & // therefore the ConsoleSaveSplit instance, which needs to be // around until all the sub files have completed saving. -#if defined(_DURANGO) || defined(__ORBIS__) +#if 0 || 0 while (StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle) { Sleep(10); @@ -2964,7 +2960,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { errorMessage = IDS_ERROR_NETWORK; // show "A network error has // occurred." -#ifdef __ORBIS__ +#if 0 if (!ProfileManager.isSignedInPSN( ProfileManager.GetPrimaryPad())) { errorMessage = @@ -3002,7 +2998,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { Sleep(50); } m_bSaveTransferRunning = false; -#ifdef __PS3__ +#if 0 StorageManager.SetSaveTransferInProgress(false); #endif return 0; @@ -3204,7 +3200,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferDialogReturned( } #endif // SONY_REMOTE_STORAGE_UPLOAD -#if defined _XBOX_ONE +#if 0 void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() { SaveTransferStateContainer* stateContainer = new SaveTransferStateContainer(); @@ -3426,7 +3422,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc(void* lpParameter) { // that will ultimately delete the directory level storage & // therefore the ConsoleSaveSplit instance, which needs to be // around until all the sub files have completed saving. -#if defined(_DURANGO) || defined(__ORBIS__) +#if 0 || 0 pMinecraft->progressRenderer->progressStage( IDS_PROGRESS_SAVING_TO_DISC); @@ -3443,7 +3439,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc(void* lpParameter) { delete pSave; -#ifdef _XBOX_ONE +#if 0 pMinecraft->progressRenderer->progressStage( IDS_SAVE_TRANSFER_DOWNLOAD_AND_CONVERT_COMPLETE); #endif @@ -3677,14 +3673,14 @@ int UIScene_LoadOrJoinMenu::NeedSyncMessageReturned( #endif -#ifdef _XBOX_ONE +#if 0 void UIScene_LoadOrJoinMenu::HandleDLCLicenseChange() { // may have installed Halloween on this menu app.StartInstallDLCProcess(m_iPad); } #endif -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 int UIScene_LoadOrJoinMenu::CopySaveDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; @@ -3771,7 +3767,7 @@ int UIScene_LoadOrJoinMenu::CopySaveDataReturned( pClass->m_iState = e_SavesRepopulateAfterDelete; ui.LeaveCallbackIdCriticalSection(); } else { -#ifdef __ORBIS__ +#if 0 unsigned int uiIDA[1]; // you cancelled the save on exit after choosing exit and save? You // go back to the Exit choices then. @@ -3842,4 +3838,4 @@ int UIScene_LoadOrJoinMenu::CopySaveErrorDialogFinishedCallback( return 0; } -#endif // _XBOX_ONE \ No newline at end of file +#endif // 0 diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h index 51703d9af..bfd2e6867 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h @@ -4,10 +4,10 @@ class LevelGenerationOptions; -#if defined __PS3__ || defined __ORBIS__ || defined(__PSVITA__) +#if 0 || 0 || 0 #define SONY_REMOTE_STORAGE_DOWNLOAD #endif -#if defined __PS3__ || __PSVITA__ +#if 0 || 0 #define SONY_REMOTE_STORAGE_UPLOAD #endif @@ -16,7 +16,7 @@ private: enum EControls { eControl_SavesList, eControl_GamesList, -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 eControl_SpaceIndicator, #endif }; @@ -46,7 +46,7 @@ protected: UIControl_SaveList m_buttonListGames; UIControl_Label m_labelSavesListTitle, m_labelJoinListTitle, m_labelNoGames; UIControl m_controlSavesTimer, m_controlJoinTimer; -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 UIControl_SpaceIndicatorBar m_spaceIndicatorSaves; #endif @@ -62,7 +62,7 @@ private: UI_MAP_ELEMENT(m_controlSavesTimer, "SavesTimer") UI_MAP_ELEMENT(m_controlJoinTimer, "JoinTimer") -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 UI_MAP_ELEMENT(m_spaceIndicatorSaves, "SaveSizeBar") #endif UI_END_MAP_ELEMENTS_AND_NAMES() @@ -94,7 +94,7 @@ private: int m_iSaveListIndex; int m_iGameListIndex; // int *m_iConfigA; // track the texture packs that we don't have installed -#ifndef _XBOX_ONE +#if 1 bool m_bSaveTransferInProgress; bool m_bSaveTransferCancelled; #endif @@ -120,7 +120,7 @@ public: virtual EUIScene getSceneType() { return eUIScene_LoadOrJoinMenu; } static void UpdateGamesListCallback(void* pParam); -#ifdef _XBOX_ONE +#if 0 void HandleDLCLicenseChange(); #endif virtual void tick(); @@ -152,7 +152,7 @@ public: static int DeleteSaveDataReturned(void* lpParam, bool bRes); static int RenameSaveDataReturned(void* lpParam, bool bRes); static int KeyboardCompleteWorldNameCallback(void* lpParam, bool bRes); -#ifdef __PSVITA__ +#if 0 static int MustSignInTexturePack(void* pParam, int iPad, C4JStorage::EMessageResult result); static int MustSignInReturnedTexturePack(void* pParam, bool bContinue, @@ -165,19 +165,19 @@ protected: void LoadLevelGen(LevelGenerationOptions* levelGen); void LoadSaveFromDisk( File* saveFile, ESavePlatform savePlatform = SAVE_FILE_PLATFORM_LOCAL); -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 void LoadSaveFromCloud(); #endif public: virtual void HandleDLCMountingComplete(); -#ifdef __ORBIS__ +#if 0 void LoadRemoteFileFromDisk(char* remoteFilename); #endif private: void CheckAndJoinGame(int gameIndex); -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 static int MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result); static int PSN_SignInReturned(void* pParam, bool bContinue, int iPad); @@ -186,11 +186,11 @@ private: int error_code); #endif -#ifdef __ORBIS__ +#if 0 // static int PSPlusReturned(void *pParam,int // iPad,C4JStorage::EMessageResult result); #endif -#ifdef _XBOX_ONE +#if 0 typedef struct _SaveTransferStateContainer { int m_iProgress; bool m_bSaveTransferInProgress; @@ -317,7 +317,7 @@ private: void* pParam, int iPad, C4JStorage::EMessageResult result); #endif -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 static int CopySaveDialogReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); static int CopySaveThreadProc(void* lpParameter); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp index fc920dc4c..a12539dc9 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp @@ -6,7 +6,7 @@ #include "../../Minecraft.Client/MinecraftServer.h" #include "UI.h" #include "UIScene_MainMenu.h" -#ifdef __ORBIS__ +#if 0 #include #endif @@ -17,11 +17,8 @@ int UIScene_MainMenu::eNavigateWhenReady = -1; UIScene_MainMenu::UIScene_MainMenu(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { -#ifdef __ORBIS - // m_ePatchCheckState=ePatchCheck_Idle; m_bRunGameChosen = false; m_bErrorDialogRunning = false; -#endif // Setup all the Iggy references we need for this scene initialiseMovie(); @@ -34,7 +31,7 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void* initData, m_buttons[(int)eControl_PlayGame].init(IDS_PLAY_GAME, eControl_PlayGame); -#ifdef _XBOX_ONE +#if 0 if (!ProfileManager.IsFullVersion()) m_buttons[(int)eControl_PlayGame].setLabel(IDS_PLAY_TRIAL_GAME); app.SetReachedMainMenu(); @@ -56,15 +53,10 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void* initData, eControl_UnlockOrDLC); } -#ifndef _DURANGO m_buttons[(int)eControl_Exit].init(app.GetString(IDS_EXIT_GAME), eControl_Exit); -#else - m_buttons[(int)eControl_XboxHelp].init(IDS_XBOX_HELP_APP, - eControl_XboxHelp); -#endif -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // Not allowed to exit from a PS3 game from the game - have to use the PS // button removeControl(&m_buttons[(int)eControl_Exit], false); @@ -73,7 +65,7 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void* initData, removeControl(&m_buttons[(int)eControl_Achievements], false); m_bLaunchFullVersionPurchase = false; #endif -#ifdef _DURANGO +#if 0 // Allowed to not have achievements in the menu removeControl(&m_buttons[(int)eControl_Achievements], false); // Not allowed to exit from a Xbox One game from the game - have to use the @@ -132,9 +124,9 @@ void UIScene_MainMenu::updateTooltips() { if (!m_bIgnorePress) { iA = IDS_TOOLTIPS_SELECT; -#ifdef _XBOX_ONE +#if 0 iX = IDS_TOOLTIPS_CHOOSE_USER; -#elif defined __PSVITA__ +#elif 0 if (ProfileManager.IsFullVersion()) { iX = IDS_TOOLTIP_CHANGE_NETWORK_MODE; } @@ -173,7 +165,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack) { m_bIgnorePress = false; updateTooltips(); -#ifdef _DURANGO +#if 0 ProfileManager.ClearGameUsers(); #endif @@ -192,7 +184,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack) { // 4J-PB - remove the "hobo humping" message legal say we can't have, and // the 1080p one for Vita -#ifdef __PSVITA__ +#if 0 int splashIndex = eSplashRandomStart + 2 + random->nextInt((int)m_splashes.size() - (eSplashRandomStart + 2)); @@ -227,7 +219,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack) { std::wstring UIScene_MainMenu::getMoviePath() { return L"MainMenu"; } void UIScene_MainMenu::handleReload() { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // Not allowed to exit from a PS3 game from the game - have to use the PS // button removeControl(&m_buttons[(int)eControl_Exit], false); @@ -235,7 +227,7 @@ void UIScene_MainMenu::handleReload() { // button removeControl(&m_buttons[(int)eControl_Achievements], false); #endif -#ifdef _DURANGO +#if 0 // Allowed to not have achievements in the menu removeControl(&m_buttons[(int)eControl_Achievements], false); #endif @@ -249,7 +241,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, if (m_bIgnorePress || (eNavigateWhenReady >= 0)) return; -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 // ignore all players except player 0 - it's their profile that is currently // being used if (iPad != 0) return; @@ -259,7 +251,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, switch (key) { case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { @@ -268,7 +260,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, sendInputToMovie(key, repeat, pressed, released); } break; -#ifdef _XBOX_ONE +#if 0 case ACTION_MENU_X: if (pressed) { m_bIgnorePress = true; @@ -278,7 +270,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, } break; #endif -#ifdef __PSVITA__ +#if 0 case ACTION_MENU_X: if (pressed && ProfileManager.IsFullVersion()) { unsigned int uiIDA[2]; @@ -302,7 +294,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, void UIScene_MainMenu::handlePress(F64 controlId, F64 childId) { int primaryPad = ProfileManager.GetPrimaryPad(); -#ifdef _XBOX_ONE +#if 0 int (*signInReturnedFunc)(void*, const bool, const int iPad, const int iController) = NULL; #else @@ -311,7 +303,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_PlayGame: -#ifdef __ORBIS__ +#if 0 { m_bIgnorePress = true; @@ -332,7 +324,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId) { case eControl_Leaderboards: // CD - Added for audio ui.PlayUISFX(eSFX_Press); -#ifdef __ORBIS__ +#if 0 ProfileManager.RefreshChatAndContentRestrictions( RefreshChatAndContentRestrictionsReturned_Leaderboards, this); #else @@ -363,32 +355,21 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId) { signInReturnedFunc = &UIScene_MainMenu::UnlockFullGame_SignInReturned; break; -#if defined _XBOX case eControl_Exit: if (ProfileManager.IsFullVersion()) { unsigned int uiIDA[2]; - uiIDA[0] = IDS_CANCEL; - uiIDA[1] = IDS_OK; + uiIDA[0] = IDS_CONFIRM_CANCEL; + uiIDA[1] = IDS_CONFIRM_OK; ui.RequestErrorMessage( - IDS_WARNING_ARCADE_TITLE, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, + IDS_EXIT_GAME, IDS_CONFIRM_EXIT_GAME, uiIDA, 2, XUSER_INDEX_ANY, &UIScene_MainMenu::ExitGameReturned, this); } else { -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif ui.NavigateToScene(primaryPad, eUIScene_TrialExitUpsell); } break; -#endif - -#ifdef _DURANGO - case eControl_XboxHelp: - ui.PlayUISFX(eSFX_Press); - - m_eAction = eAction_RunXboxHelp; - signInReturnedFunc = &UIScene_MainMenu::XboxHelp_SignInReturned; - break; -#endif default: __debugbreak(); @@ -436,7 +417,7 @@ void UIScene_MainMenu::RunAction(int iPad) { case eAction_RunUnlockOrDLC: RunUnlockOrDLC(iPad); break; -#ifdef _DURANGO +#if 0 case eAction_RunXboxHelp: // 4J: Launch the dummy xbox help application. WXS::User ^ user = @@ -545,7 +526,7 @@ int UIScene_MainMenu::MustSignInReturned(void* pParam, int iPad, &UIScene_MainMenu::UnlockFullGame_SignInReturned, pClass, iPad); break; -#ifdef _DURANGO +#if 0 case eAction_RunXboxHelp: ProfileManager.RequestSignInUI( false, false, true, false, true, @@ -571,13 +552,13 @@ int UIScene_MainMenu::MustSignInReturned(void* pParam, int iPad, return 0; } -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 int UIScene_MainMenu::MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam; if (result == C4JStorage::EMessage_ResultAccept) { -#ifdef __PS3__ +#if 0 // we need to specify local game here to display local and LIVE profiles // in the list switch (pClass->m_eAction) { @@ -594,7 +575,7 @@ int UIScene_MainMenu::MustSignInReturnedPSN(void* pParam, int iPad, &UIScene_MainMenu::UnlockFullGame_SignInReturned, pClass); break; } -#elif defined __PSVITA__ +#elif 0 switch (pClass->m_eAction) { case eAction_RunLeaderboardsPSN: // CD - Must force Ad-Hoc off if they want leaderboard PSN @@ -661,7 +642,7 @@ int UIScene_MainMenu::MustSignInReturnedPSN(void* pParam, int iPad, } #endif -#ifdef _XBOX_ONE +#if 0 int UIScene_MainMenu::HelpAndOptions_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) @@ -683,7 +664,7 @@ int UIScene_MainMenu::HelpAndOptions_SignInReturned(void* pParam, #endif { ProfileManager.SetLockedProfile(ProfileManager.GetPrimaryPad()); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(iPad, eUIScene_HelpAndOptionsMenu); @@ -723,7 +704,7 @@ int UIScene_MainMenu::HelpAndOptions_SignInReturned(void* pParam, return 0; } -#ifdef _XBOX_ONE +#if 0 int UIScene_MainMenu::ChooseUser_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) { UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam; @@ -733,7 +714,7 @@ int UIScene_MainMenu::ChooseUser_SignInReturned(void* pParam, bool bContinue, } #endif -#ifdef _XBOX_ONE +#if 0 int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) #else @@ -764,7 +745,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, if (ProfileManager.IsFullVersion()) { bool bSignedInLive = ProfileManager.IsSignedInLive(iPad); -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode()) { if (SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { bSignedInLive = true; @@ -791,7 +772,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, 1); } else { // 4J Stu - Not relevant to PS3 -#ifdef _XBOX_ONE +#if 0 // if(app.GetTMSDLCInfoRead() //&& app.GetBanListRead(iPad)) if (app.GetBanListRead(iPad)) { @@ -803,7 +784,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, // ensure we've applied this player's settings app.ApplyGameSettingsChanged(iPad); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(ProfileManager.GetPrimaryPad(), @@ -877,7 +858,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, // ensure we've applied this player's settings app.ApplyGameSettingsChanged(iPad); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(ProfileManager.GetPrimaryPad(), @@ -893,7 +874,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, #else app.DebugPrintf( "Offline Profile returned not implemented\n"); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(ProfileManager.GetPrimaryPad(), @@ -908,13 +889,13 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, // ensure we've applied this player's settings // app.ApplyGameSettingsChanged(iPad); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // ensure we've applied this player's settings - we do have them // on PS3 app.ApplyGameSettingsChanged(iPad); #endif -#ifdef __ORBIS__ +#if 0 if (!g_NetworkManager.IsReadyToPlayOrIdle()) { pClass->m_bLoadTrialOnNetworkManagerReady = true; ui.NavigateToScene(iPad, eUIScene_Timer); @@ -942,7 +923,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, return 0; } -#ifdef _XBOX_ONE +#if 0 int UIScene_MainMenu::Leaderboards_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) #else @@ -969,17 +950,17 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void* pParam, bool bContinue, ProfileManager.GetPrimaryPad())) { pClass->m_bIgnorePress = false; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1); + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); } else { bool bContentRestricted = false; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 ProfileManager.GetChatAndContentRestrictions( iPad, true, NULL, &bContentRestricted, NULL); #endif if (bContentRestricted) { pClass->m_bIgnorePress = false; -#if !(defined(_XBOX) || defined(_WINDOWS64) || \ - defined(_XBOX_ONE)) // 4J Stu - Temp to get the win build running, but so +#if !(0 || defined(_WINDOWS64) || \ + 0) // 4J Stu - Temp to get the win build running, but so // we check this for other platforms // you can't see leaderboards unsigned int uiIDA[1]; @@ -990,7 +971,7 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void* pParam, bool bContinue, #endif } else { ProfileManager.SetLockedProfile(ProfileManager.GetPrimaryPad()); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(ProfileManager.GetPrimaryPad(), @@ -1012,7 +993,7 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void* pParam, bool bContinue, return 0; } -#ifdef _XBOX_ONE +#if 0 int UIScene_MainMenu::Achievements_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) #else @@ -1045,7 +1026,7 @@ int UIScene_MainMenu::Achievements_SignInReturned(void* pParam, bool bContinue, return 0; } -#ifdef _XBOX_ONE +#if 0 int UIScene_MainMenu::UnlockFullGame_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) @@ -1079,7 +1060,7 @@ int UIScene_MainMenu::UnlockFullGame_SignInReturned(void* pParam, return 0; } -#ifdef _XBOX_ONE +#if 0 int UIScene_MainMenu::XboxHelp_SignInReturned(void* pParam, bool bContinue, int iPad, int iController) { UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam; @@ -1118,7 +1099,7 @@ int UIScene_MainMenu::ExitGameReturned(void* pParam, int iPad, return 0; } -#ifdef __ORBIS__ +#if 0 void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame( void* pParam) { int primaryPad = ProfileManager.GetPrimaryPad(); @@ -1337,7 +1318,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { if (ProfileManager.IsFullVersion()) { // are we offline? bool bSignedInLive = ProfileManager.IsSignedInLive(iPad); -#ifdef __PSVITA__ +#if 0 if (app.GetGameSettings(ProfileManager.GetPrimaryPad(), eGameSetting_PSVita_NetworkModeAdhoc) == true) { @@ -1351,14 +1332,14 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { bSignedInLive ? "true" : "false"); } -#endif //__PSVITA__ +#endif //0 if (!bSignedInLive) { -#if defined(__PS3__) || defined __PSVITA__ +#if 0 || 0 // enable input again m_bIgnorePress = false; - // Not sure why 360 doesn't need this, but leaving as __PS3__ + // Not sure why 360 doesn't need this, but leaving as 0 // only for now until we see that it does. Without this, on a // PS3 offline game, the primary player just gets the default // Player1234 type name @@ -1371,7 +1352,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT; uiIDA[1] = IDS_PRO_NOTONLINE_DECLINE; -#ifdef __PSVITA__ +#if 0 if (CGameNetworkManager::usingAdhocMode()) { uiIDA[0] = IDS_NETWORK_ADHOC; // this should be "Connect to adhoc network" @@ -1417,7 +1398,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { iPad, &UIScene_MainMenu::MustSignInReturnedPSN, this); #endif -#elif defined __ORBIS__ +#elif 0 // Determine why they're not "signed in live" if (ProfileManager.isSignedInPSN(iPad)) { @@ -1444,14 +1425,14 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { } #else ProfileManager.SetLockedProfile(iPad); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu); #endif } else { -#ifdef _XBOX_ONE +#if 0 if (!app.GetBanListRead(iPad)) { app.SetTMSAction( iPad, eTMSAction_TMSPP_RetrieveFiles_RunPlayGame); @@ -1520,7 +1501,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { // ensure we've applied this player's settings app.ApplyGameSettingsChanged(iPad); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(ProfileManager.GetPrimaryPad(), @@ -1540,13 +1521,13 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { // this player's settings // app.ApplyGameSettingsChanged(iPad); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // ensure we've applied this player's settings - we do have them on // PS3 app.ApplyGameSettingsChanged(iPad); #endif -#ifdef __ORBIS__ +#if 0 if (!g_NetworkManager.IsReadyToPlayOrIdle()) { m_bLoadTrialOnNetworkManagerReady = true; ui.NavigateToScene(iPad, eUIScene_Timer); @@ -1568,7 +1549,7 @@ void UIScene_MainMenu::RunLeaderboards(int iPad) { ui.RequestErrorMessage(IDS_PRO_GUESTPROFILE_TITLE, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1); } else if (!ProfileManager.IsSignedInLive(iPad)) { -#if defined __PS3__ || defined __PSVITA__ +#if 0 || 0 m_eAction = eAction_RunLeaderboardsPSN; // get them to sign in to online unsigned int uiIDA[1]; @@ -1578,7 +1559,7 @@ void UIScene_MainMenu::RunLeaderboards(int iPad) { &UIScene_MainMenu::MustSignInReturnedPSN, this); /* 4J-PB - Add this after release -#elif defined __PSVITA__ +#elif 0 m_eAction=eAction_RunLeaderboardsPSN; // Determine why they're not "signed in live" if (ProfileManager.IsSignedInPSN(iPad)) @@ -1598,7 +1579,7 @@ IDS_PRO_PSNOFFLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), &UIScene_MainMenu::MustSignInReturnedPSN, this, app.GetStringTable()); return; }*/ -#elif defined __ORBIS__ +#elif 0 m_eAction = eAction_RunLeaderboardsPSN; // Determine why they're not "signed in live" if (ProfileManager.isSignedInPSN(iPad)) { @@ -1621,7 +1602,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), } #else ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1); + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); #endif } else { // we're supposed to check for parental control restrictions before @@ -1635,13 +1616,13 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), // for this user. bool bContentRestricted = false; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 ProfileManager.GetChatAndContentRestrictions(iPad, true, NULL, &bContentRestricted, NULL); #endif if (bContentRestricted) { -#if !(defined(_XBOX) || defined(_WINDOWS64) || \ - defined(_XBOX_ONE)) // 4J Stu - Temp to get the win build running, but so +#if !(0 || defined(_WINDOWS64) || \ + 0) // 4J Stu - Temp to get the win build running, but so // we check this for other platforms // you can't see leaderboards unsigned int uiIDA[1]; @@ -1657,7 +1638,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), // happen ProfileManager.QuerySigninStatus(); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(iPad, eUIScene_LeaderboardsMenu); @@ -1670,7 +1651,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { // Check if this means downloadable content if (ProfileManager.IsFullVersion()) { -#ifdef __ORBIS__ +#if 0 // 4J-PB - Check if there is a patch for the game m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad()); @@ -1734,19 +1715,19 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { // this to happen ProfileManager.QuerySigninStatus(); -#if defined _XBOX_ONE +#if 0 if (app.GetTMSDLCInfoRead()) #endif { bool bContentRestricted = false; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 ProfileManager.GetChatAndContentRestrictions( iPad, true, NULL, &bContentRestricted, NULL); #endif if (bContentRestricted) { m_bIgnorePress = false; -#if !(defined(_XBOX) || defined(_WINDOWS64) || \ - defined(_XBOX_ONE)) // 4J Stu - Temp to get the win build running, but so +#if !(0 || defined(_WINDOWS64) || \ + 0) // 4J Stu - Temp to get the win build running, but so // we check this for other platforms // you can't see the store unsigned int uiIDA[1]; @@ -1758,14 +1739,14 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { #endif } else { ProfileManager.SetLockedProfile(iPad); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_DLCMainMenu); } } -#if defined _XBOX_ONE +#if 0 else { // Changing to async TMS calls app.SetTMSAction(iPad, @@ -1797,7 +1778,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { // app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DLCMainMenu); } } else { -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 m_eAction = eAction_RunUnlockOrDLCPSN; // get them to sign in to online unsigned int uiIDA[1]; @@ -1807,7 +1788,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), &UIScene_MainMenu::MustSignInReturnedPSN, this); -#elif defined __ORBIS__ +#elif 0 m_eAction = eAction_RunUnlockOrDLCPSN; // Determine why they're not "signed in live" if (ProfileManager.isSignedInPSN(iPad)) { @@ -1833,7 +1814,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1); + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); #endif } } else { @@ -1843,7 +1824,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { ui.RequestErrorMessage(IDS_UNLOCK_TITLE, IDS_UNLOCK_GUEST_TEXT, uiIDA, 1, iPad); } else if (!ProfileManager.IsSignedInLive(iPad)) { -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 m_eAction = eAction_RunUnlockOrDLCPSN; // get them to sign in to online unsigned int uiIDA[1]; @@ -1852,7 +1833,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), &UIScene_MainMenu::MustSignInReturnedPSN, this); -#elif defined __ORBIS__ +#elif 0 m_eAction = eAction_RunUnlockOrDLCPSN; // Determine why they're not "signed in live" if (ProfileManager.isSignedInPSN(iPad)) { @@ -1878,7 +1859,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1); + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); #endif } else { @@ -1890,7 +1871,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { // check that the commerce is in the right state to be able to // display the full version purchase - if the user is fast with the // trial version, it can still be retrieving the product list -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 m_bIgnorePress = true; m_bLaunchFullVersionPurchase = true; @@ -1931,7 +1912,7 @@ void UIScene_MainMenu::tick() { if ((eNavigateWhenReady >= 0)) { int lockedProfile = ProfileManager.GetLockedProfile(); -#ifdef _DURANGO +#if 0 // 4J-JEV: DLC menu contains text localised to system language // which we can't change. We need to switch to // this language in-case it uses a different font. @@ -1969,7 +1950,7 @@ void UIScene_MainMenu::tick() { ui.NavigateToScene(lockedProfile, (EUIScene)eNavigateWhenReady); eNavigateWhenReady = -1; } -#ifdef _DURANGO +#if 0 else { app.DebugPrintf( "[MainMenu] Delaying navigation: lockedProfile=%i, %s, " @@ -1981,7 +1962,7 @@ void UIScene_MainMenu::tick() { #endif } -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (m_bLaunchFullVersionPurchase) { int iCommerceState = app.GetCommerceState(); // 4J-PB - if there's a commerce error - store down, player can't access @@ -2024,7 +2005,7 @@ void UIScene_MainMenu::tick() { } #endif -#if defined _XBOX_ONE +#if 0 if (m_bWaitingForDLCInfo) { if (app.GetTMSDLCInfoRead()) { m_bWaitingForDLCInfo = false; @@ -2042,7 +2023,7 @@ void UIScene_MainMenu::tick() { } #endif -#ifdef __ORBIS__ +#if 0 // process the error dialog (for a patch being available) // SQRNetworkManager_Orbis::tickErrorDialog also runs the error dialog, so @@ -2112,7 +2093,7 @@ void UIScene_MainMenu::RunHelpAndOptions(int iPad) { #endif { ProfileManager.SetLockedProfile(iPad); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif proceedToScene(iPad, eUIScene_HelpAndOptionsMenu); @@ -2166,7 +2147,7 @@ void UIScene_MainMenu::LoadTrial(void) { // not online for the trial game g_NetworkManager.HostGame(0, false, true, MINECRAFT_NET_MAX_PLAYERS, 0); -#ifndef _XBOX +#if 1 g_NetworkManager.FakeLocalPlayerJoined(); #endif @@ -2193,7 +2174,7 @@ void UIScene_MainMenu::LoadTrial(void) { ui.ShowTrialTimer(true); -#ifdef _XBOX_ONE +#if 0 ui.ShowPlayerDisplayname(true); #endif ui.NavigateToScene(ProfileManager.GetPrimaryPad(), @@ -2205,7 +2186,7 @@ void UIScene_MainMenu::handleUnlockFullVersion() { true); } -#ifdef __PSVITA__ +#if 0 int UIScene_MainMenu::SelectNetworkModeReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam; @@ -2220,4 +2201,4 @@ int UIScene_MainMenu::SelectNetworkModeReturned( pClass->updateTooltips(); return 0; } -#endif //__PSVITA__ \ No newline at end of file +#endif //0 diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.h index 7abc35f9c..d8e050653 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.h @@ -10,15 +10,11 @@ private: eControl_Achievements, eControl_HelpAndOptions, eControl_UnlockOrDLC, -#ifndef _DURANGO eControl_Exit, -#else - eControl_XboxHelp, -#endif eControl_Count, }; - // #ifdef __ORBIS__ + // #ifdef 0 // enum EPatchCheck // { // ePatchCheck_Idle, @@ -35,11 +31,7 @@ private: UI_MAP_ELEMENT(m_buttons[(int)eControl_Achievements], "Button3") UI_MAP_ELEMENT(m_buttons[(int)eControl_HelpAndOptions], "Button4") UI_MAP_ELEMENT(m_buttons[(int)eControl_UnlockOrDLC], "Button5") -#ifndef _DURANGO UI_MAP_ELEMENT(m_buttons[(int)eControl_Exit], "Button6") -#else - UI_MAP_ELEMENT(m_buttons[(int)eControl_XboxHelp], "Button6") -#endif UI_MAP_ELEMENT(m_controlTimer, "Timer") UI_END_MAP_ELEMENTS_AND_NAMES() @@ -47,11 +39,11 @@ private: bool m_bIgnorePress; bool m_bTrialVersion; bool m_bLoadTrialOnNetworkManagerReady; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 bool m_bLaunchFullVersionPurchase; #endif -#ifdef _XBOX_ONE +#if 0 bool m_bWaitingForDLCInfo; #endif @@ -77,11 +69,11 @@ private: eAction_RunAchievements, eAction_RunHelpAndOptions, eAction_RunUnlockOrDLC, -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 eAction_RunLeaderboardsPSN, eAction_RunGamePSN, eAction_RunUnlockOrDLCPSN, -#elif defined _DURANGO +#elif 0 eAction_RunXboxHelp, #endif @@ -101,7 +93,7 @@ public: virtual ~UIScene_MainMenu(); // Returns true if this scene has focus for the pad passed in -#ifndef __PS3__ +#if 1 virtual bool hasFocus(int iPad) { return bHasFocus; } #endif @@ -144,29 +136,6 @@ private: static void LoadTrial(); -#ifdef _XBOX_ONE - static int ChooseUser_SignInReturned(void* pParam, bool bContinue, int iPad, - int iController); - static int CreateLoad_SignInReturned(void* pParam, bool bContinue, int iPad, - int iController); - static int HelpAndOptions_SignInReturned(void* pParam, bool bContinue, - int iPad, int iController); - static int Achievements_SignInReturned(void* pParam, bool bContinue, - int iPad, int iController); - static int MustSignInReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - - static int Leaderboards_SignInReturned(void* pParam, bool bContinue, - int iPad, int iController); - static int UnlockFullGame_SignInReturned(void* pParam, bool bContinue, - int iPad, int iController); - static int ExitGameReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - - static int XboxHelp_SignInReturned(void* pParam, bool bContinue, int iPad, - int iController); -#else - static int CreateLoad_SignInReturned(void* pParam, bool bContinue, int iPad); static int HelpAndOptions_SignInReturned(void* pParam, bool bContinue, @@ -176,7 +145,7 @@ private: static int MustSignInReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 static int MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result); #endif @@ -186,8 +155,7 @@ private: int iPad); static int ExitGameReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); - -#ifdef __ORBIS__ +#if 0 static void RefreshChatAndContentRestrictionsReturned_PlayGame( void* pParam); static void RefreshChatAndContentRestrictionsReturned_Leaderboards( @@ -196,17 +164,7 @@ private: static int PlayOfflineReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); #endif -#endif - -#ifdef __PSVITA__ - static int SelectNetworkModeReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); -#endif - -#ifdef __ORBIS__ - // EPatchCheck m_ePatchCheckState; bool m_bRunGameChosen; int32_t m_errorCode; bool m_bErrorDialogRunning; -#endif -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp index 3171e657c..130e47818 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp @@ -55,7 +55,7 @@ UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData, parentLayer->addComponent(iPad, eUIComponent_MenuBackground); // 4J-TomK - rebuild touch after auto resize -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif } @@ -111,7 +111,7 @@ void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.cpp index eb7c4e8c5..8d060bef1 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.cpp @@ -36,7 +36,7 @@ UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData, m_bIgnoreInput = false; -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif } @@ -57,7 +57,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, bool& handled) { if (m_bIgnoreInput) return; -#ifdef __ORBIS__ +#if 0 // ignore all players except player 0 - it's their profile that is currently // being used if (iPad != 0) return; @@ -78,7 +78,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, app.CheckGameSettingsChanged(true, m_iPad); ui.NavigateBack(m_iPad); } break; -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_OK: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.h b/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.h index 0d69069a4..6d4fe5685 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_NewUpdateMessage.h @@ -24,7 +24,7 @@ public: virtual EUIScene getSceneType() { return eUIScene_EULA; } // Returns true if this scene has focus for the pad passed in -#ifndef __PS3__ +#if 1 virtual bool hasFocus(int iPad) { return bHasFocus; } #endif virtual void updateTooltips(); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp index d9068cfd0..80ec496e2 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp @@ -7,11 +7,11 @@ #include "../../Minecraft.Client/Textures/Packs/TexturePack.h" #include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #include "../../Minecraft.World/Util/StringHelpers.h" -#ifdef __ORBIS__ +#if 0 #include #endif -#if defined __PS3__ || defined __ORBIS__ +#if 0 || 0 #define USE_SONY_REMOTE_STORAGE #endif @@ -29,14 +29,9 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, app.GetString(IDS_HELP_AND_OPTIONS), BUTTON_PAUSE_HELPANDOPTIONS); m_buttons[BUTTON_PAUSE_LEADERBOARDS].init(app.GetString(IDS_LEADERBOARDS), BUTTON_PAUSE_LEADERBOARDS); -#ifdef _DURANGO - m_buttons[BUTTON_PAUSE_XBOXHELP].init(app.GetString(IDS_XBOX_HELP_APP), - BUTTON_PAUSE_XBOXHELP); -#else m_buttons[BUTTON_PAUSE_ACHIEVEMENTS].init(app.GetString(IDS_ACHIEVEMENTS), BUTTON_PAUSE_ACHIEVEMENTS); -#endif -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 m_bTrialTexturePack = false; if (!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) { TexturePack* tPack = Minecraft::GetInstance()->skins->getSelected(); @@ -141,13 +136,13 @@ std::wstring UIScene_PauseMenu::getMoviePath() { void UIScene_PauseMenu::tick() { UIScene::tick(); -#ifdef __PSVITA__ +#if 0 // 4J-MGH - Need to check for installed DLC here, as we delay the // installation of the key file on Vita if (!app.DLCInstallProcessCompleted()) app.StartInstallDLCProcess(0); #endif -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 if (!m_bTrialTexturePack && m_savesDisabled != (app.GetGameHostOption(eGameHostOption_DisableSaving) != 0) && @@ -166,7 +161,7 @@ void UIScene_PauseMenu::tick() { } #endif -#ifdef __ORBIS__ +#if 0 // Process the error dialog (for a patch being available) if (m_bErrorDialogRunning) { SceErrorDialogStatus stat = sceErrorDialogUpdateStatus(); @@ -183,13 +178,13 @@ void UIScene_PauseMenu::updateTooltips() { bool bIsisPrimaryHost = g_NetworkManager.IsHost() && (ProfileManager.GetPrimaryPad() == m_iPad); -#ifdef _XBOX_ONE +#if 0 bool bDisplayBanTip = !g_NetworkManager.IsLocalGame() && !bIsisPrimaryHost && !ProfileManager.IsGuest(m_iPad); #endif int iY = -1; -#if defined __PS3__ || defined __ORBIS__ +#if 0 || 0 if (m_iPad == ProfileManager.GetPrimaryPad()) iY = IDS_TOOLTIPS_GAME_INVITES; #endif @@ -199,25 +194,25 @@ void UIScene_PauseMenu::updateTooltips() { if (ProfileManager.IsFullVersion()) { if (StorageManager.GetSaveDisabled()) { iX = bIsisPrimaryHost ? IDS_TOOLTIPS_SELECTDEVICE : -1; -#ifdef _XBOX_ONE +#if 0 iRB = bDisplayBanTip ? IDS_TOOLTIPS_BANLEVEL : -1; #endif if (CSocialManager::Instance()->IsTitleAllowedToPostImages() && CSocialManager::Instance()->AreAllUsersAllowedToPostImages() && bUserisClientSide) { -#ifndef __PS3__ +#if 1 iY = IDS_TOOLTIPS_SHARE; #endif } } else { iX = bIsisPrimaryHost ? IDS_TOOLTIPS_CHANGEDEVICE : -1; -#ifdef _XBOX_ONE +#if 0 iRB = bDisplayBanTip ? IDS_TOOLTIPS_BANLEVEL : -1; #endif if (CSocialManager::Instance()->IsTitleAllowedToPostImages() && CSocialManager::Instance()->AreAllUsersAllowedToPostImages() && bUserisClientSide) { -#ifndef __PS3__ +#if 1 iY = IDS_TOOLTIPS_SHARE; #endif } @@ -238,7 +233,7 @@ void UIScene_PauseMenu::updateComponents() { } void UIScene_PauseMenu::handlePreReload() { -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 if (ProfileManager.GetPrimaryPad() == m_iPad) { // 4J-TomK - check for all possible labels being fed into // BUTTON_PAUSE_SAVEGAME (Bug 163775) this has to be done before button @@ -258,7 +253,7 @@ void UIScene_PauseMenu::handleReload() { updateTooltips(); updateControlsVisibility(); -#if defined _XBOX_ONE || defined __ORBIS__ +#if 0 || 0 if (ProfileManager.GetPrimaryPad() == m_iPad) { // We show the save button if saves are disabled as this lets us show a // prompt to enable them (via purchasing a texture pack) @@ -293,11 +288,11 @@ void UIScene_PauseMenu::updateControlsVisibility() { if (app.GetLocalPlayerCount() > 1) { // Hide the BUTTON_PAUSE_LEADERBOARDS and BUTTON_PAUSE_ACHIEVEMENTS removeControl(&m_buttons[BUTTON_PAUSE_LEADERBOARDS], false); -#ifndef _XBOX_ONE +#if 1 removeControl(&m_buttons[BUTTON_PAUSE_ACHIEVEMENTS], false); #endif } -#ifdef __PSVITA__ +#if 0 // MGH added - remove leaderboards in adhoc if (CGameNetworkManager::usingAdhocMode()) { removeControl(&m_buttons[BUTTON_PAUSE_LEADERBOARDS], false); @@ -312,7 +307,7 @@ void UIScene_PauseMenu::updateControlsVisibility() { // Hide the BUTTON_PAUSE_LEADERBOARDS, BUTTON_PAUSE_ACHIEVEMENTS and // BUTTON_PAUSE_SAVEGAME removeControl(&m_buttons[BUTTON_PAUSE_LEADERBOARDS], false); -#ifndef _XBOX_ONE +#if 1 removeControl(&m_buttons[BUTTON_PAUSE_ACHIEVEMENTS], false); #endif removeControl(&m_buttons[BUTTON_PAUSE_SAVEGAME], false); @@ -320,13 +315,13 @@ void UIScene_PauseMenu::updateControlsVisibility() { // is saving disabled? if (StorageManager.GetSaveDisabled()) { -#ifdef _XBOX +#if 0 // disable save button m_buttons[BUTTON_PAUSE_SAVEGAME].setEnable(false); #endif } -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 // We don't have a way to display trophies/achievements, so remove the // button, and we're allowed to not have it on Xbox One removeControl(&m_buttons[BUTTON_PAUSE_ACHIEVEMENTS], false); @@ -345,7 +340,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); ui.AnimateKeyPress(iPad, key, repeat, pressed, released); -#ifdef _XBOX_ONE +#if 0 bool bIsisPrimaryHost = g_NetworkManager.IsHost() && (ProfileManager.GetPrimaryPad() == iPad); bool bDisplayBanTip = !g_NetworkManager.IsLocalGame() && @@ -353,16 +348,16 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, #endif switch (key) { -#ifdef _DURANGO +#if 0 case ACTION_MENU_GTC_RESUME: #endif -#if defined(__PS3__) // not for Orbis - we want to use the pause menu (touchpad +#if 0 // not for Orbis - we want to use the pause menu (touchpad // press) to select a menu item case ACTION_MENU_PAUSEMENU: #endif case ACTION_MENU_CANCEL: if (pressed) { -#ifdef _DURANGO +#if 0 // DurangoStatsDebugger::PrintStats(iPad); #endif // TODO: proper fix for pausing @@ -384,7 +379,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: @@ -414,9 +409,9 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, #endif case ACTION_MENU_Y: { -#if defined(__PS3__) || defined(__ORBIS__) +#if 0 || 0 if (pressed && iPad == ProfileManager.GetPrimaryPad()) { -#ifdef __ORBIS__ +#if 0 // If a patch is available, can't view invites if (CheckForPatch()) break; #endif @@ -424,7 +419,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, // Are we offline? if (!ProfileManager.IsSignedInLive(iPad)) { m_eAction = eAction_ViewInvitesPSN; -#ifdef __ORBIS__ +#if 0 int npAvailability = ProfileManager.getNPAvailability(iPad); if (npAvailability == SCE_NP_ERROR_AGE_RESTRICTION) { // 4J Stu - This is a bit messy and is due to the @@ -457,7 +452,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, &UIScene_PauseMenu::MustSignInReturnedPSN, (LPVOID)GetCallbackUniqueId()); } -#else // __PS3__ +#else // 0 // get them to sign in to online unsigned int uiIDA[1]; uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT; @@ -467,9 +462,9 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, (LPVOID)GetCallbackUniqueId()); #endif } else { -#ifdef __ORBIS__ +#if 0 SQRNetworkManager_Orbis::RecvInviteGUI(); -#else // __PS3__ +#else // 0 int ret = sceNpBasicRecvMessageCustom( SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE, SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE, @@ -498,9 +493,9 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, } rfHandled = TRUE; #endif -#endif // __PS3__ +#endif // 0 } break; -#ifdef _XBOX_ONE +#if 0 case ACTION_MENU_RIGHT_SCROLL: if (bDisplayBanTip) { unsigned int uiIDA[2]; @@ -547,7 +542,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); } else if (!ProfileManager.IsSignedInLive(m_iPad)) { -#ifdef __ORBIS__ +#if 0 // If a patch is available, can't show leaderboard if (CheckForPatch()) break; @@ -569,17 +564,17 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { #endif -#if defined __PS3__ || __PSVITA__ +#if 0 || 0 // get them to sign in to online m_eAction = eAction_ViewLeaderboardsPSN; unsigned int uiIDA[1]; uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT; ui.RequestAlertMessage( - IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, + IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad(), &UIScene_PauseMenu::MustSignInReturnedPSN, (LPVOID)GetCallbackUniqueId()); -#elif defined(__ORBIS__) +#elif 0 m_eAction = eAction_ViewLeaderboardsPSN; int npAvailability = ProfileManager.getNPAvailability(m_iPad); if (npAvailability == SCE_NP_ERROR_AGE_RESTRICTION) { @@ -618,18 +613,18 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { #else unsigned int uiIDA[1] = {IDS_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, m_iPad); #endif } else { bool bContentRestricted = false; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 ProfileManager.GetChatAndContentRestrictions( m_iPad, true, NULL, &bContentRestricted, NULL); #endif if (bContentRestricted) { -#if !(defined(_XBOX) || defined(_WINDOWS64) || \ - defined(_XBOX_ONE)) // 4J Stu - Temp to get the win build running, but so +#if !(0 || defined(_WINDOWS64) || \ + 0) // 4J Stu - Temp to get the win build running, but so // we check this for other platforms // you can't see leaderboards unsigned int uiIDA[1]; @@ -643,27 +638,18 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { } } } break; -#ifdef _DURANGO - case BUTTON_PAUSE_XBOXHELP: { - // 4J: Launch the crummy xbox help application. - WXS::User ^ user = ProfileManager.GetUser(m_iPad); - Windows::Xbox::ApplicationModel::Help::Show(user); - } break; -#elif TO_BE_IMPLEMENTED case BUTTON_PAUSE_ACHIEVEMENTS: - // guests can't look at achievements - if (ProfileManager.IsGuest(pNotifyPressData->UserIndex)) { + if (ProfileManager.IsGuest(m_iPad)) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.RequestAlertMessage(IDS_PRO_GUESTPROFILE_TITLE, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); } else { - XShowAchievementsUI(pNotifyPressData->UserIndex); + XShowAchievementsUI(m_iPad); } break; -#endif case BUTTON_PAUSE_HELPANDOPTIONS: ui.NavigateToScene(m_iPad, eUIScene_HelpAndOptionsMenu); @@ -685,7 +671,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { ->getSessionTimer(); } -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -821,24 +807,24 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { void UIScene_PauseMenu::PerformActionSaveGame() { // is the player trying to save in the trial version? if (!ProfileManager.IsFullVersion()) { -#ifdef __ORBIS__ +#if 0 // If a patch is available, can't buy full game if (CheckForPatch()) return; #endif // Unlock the full version? if (!ProfileManager.IsSignedInLive(m_iPad)) { -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 m_eAction = eAction_SaveGamePSN; unsigned int uiIDA[2]; uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT; uiIDA[1] = IDS_PRO_NOTONLINE_DECLINE; ui.RequestAlertMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 2, + IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(), &UIScene_PauseMenu::MustSignInReturnedPSN, (LPVOID)GetCallbackUniqueId()); -#elif defined(__ORBIS__) +#elif 0 m_eAction = eAction_SaveGamePSN; int npAvailability = ProfileManager.getNPAvailability(m_iPad); if (npAvailability == SCE_NP_ERROR_AGE_RESTRICTION) { @@ -894,7 +880,7 @@ void UIScene_PauseMenu::PerformActionSaveGame() { if (!m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { // upsell -#ifdef _XBOX +#if 0 ULONGLONG ullOfferID_Full; // get the dlc texture pack DLCTexturePack* pDLCTexPack = (DLCTexturePack*)tPack; @@ -914,7 +900,7 @@ void UIScene_PauseMenu::PerformActionSaveGame() { // Give the player a warning about the trial version of the texture // pack -#ifdef __PSVITA__ +#if 0 if (app.DLCInstallProcessCompleted() && !SonyCommerce_Vita:: getDLCUpgradePending()) // MGH - devtrack #5861 On vita it @@ -942,7 +928,7 @@ void UIScene_PauseMenu::PerformActionSaveGame() { C4JStorage::ESaveGameState result = StorageManager.DoesSaveExist(&bSaveExists); -#ifdef _XBOX +#if 0 if (result == C4JStorage::ELoadGame_DeviceRemoved) { // this will be a tester trying to be clever unsigned int uiIDA[2]; @@ -956,7 +942,7 @@ void UIScene_PauseMenu::PerformActionSaveGame() { } else #endif { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 if (!m_savesDisabled) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CANCEL; @@ -978,7 +964,7 @@ void UIScene_PauseMenu::PerformActionSaveGame() { m_iPad, &IUIScene_PauseMenu::SaveGameDialogReturned, (LPVOID)GetCallbackUniqueId()); } else { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -1043,7 +1029,7 @@ int UIScene_PauseMenu::UnlockFullSaveReturned( if (result == C4JStorage::EMessage_ResultAccept) { if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 bool bContentRestricted; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), true, NULL, &bContentRestricted, @@ -1084,7 +1070,7 @@ int UIScene_PauseMenu::SaveGame_SignInReturned(void* pParam, bool bContinue, return 0; } -#ifdef _XBOX_ONE +#if 0 int UIScene_PauseMenu::BanGameDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // results switched for this dialog @@ -1095,13 +1081,13 @@ int UIScene_PauseMenu::BanGameDialogReturned( } #endif -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 int UIScene_PauseMenu::MustSignInReturnedPSN( void* pParam, int iPad, C4JStorage::EMessageResult result) { UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)ui.GetSceneFromCallbackId((size_t)pParam); if (result == C4JStorage::EMessage_ResultAccept && pClass) { -#ifdef __PS3__ +#if 0 switch (pClass->m_eAction) { case eAction_ViewLeaderboardsPSN: SQRNetworkManager_PS3::AttemptPSNSignIn( @@ -1121,7 +1107,7 @@ int UIScene_PauseMenu::MustSignInReturnedPSN( &UIScene_PauseMenu::BuyTexturePack_SignInReturned, pParam); break; } -#elif defined __PSVITA__ +#elif 0 switch (pClass->m_eAction) { case eAction_ViewLeaderboardsPSN: // CD - Must force Ad-Hoc off if they want leaderboard PSN @@ -1193,7 +1179,7 @@ int UIScene_PauseMenu::ViewLeaderboards_SignInReturned(void* pParam, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); } else if (ProfileManager.IsSignedInLive(iPad)) { -#ifndef __ORBIS__ +#if 1 bool bContentRestricted = false; ProfileManager.GetChatAndContentRestrictions( pClass->m_iPad, true, NULL, &bContentRestricted, NULL); @@ -1218,16 +1204,16 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned( UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)ui.GetSceneFromCallbackId((size_t)pParam); -#ifdef __ORBIS__ +#if 0 // If a patch is available, can't proceed if (!pClass || pClass->CheckForPatch()) return 0; #endif -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (result == C4JStorage::EMessage_ResultAccept) { if (!ProfileManager.IsSignedInLive(iPad)) { if (pClass) pClass->m_eAction = eAction_SaveGamePSN; -#ifdef __ORBIS__ // Check if PSN is unavailable because of age restriction +#if 0 // Check if PSN is unavailable because of age restriction int npAvailability = ProfileManager.getNPAvailability(iPad); if (npAvailability == SCE_NP_ERROR_AGE_RESTRICTION) { // 4J Stu - This is a bit messy and is due to the library @@ -1255,17 +1241,17 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned( 1, iPad, &UIScene_PauseMenu::MustSignInReturnedPSN, pParam); } -#else // __PS3__ +#else // 0 // You're not signed in to PSN! unsigned int uiIDA[2]; uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT; uiIDA[1] = IDS_PRO_NOTONLINE_DECLINE; ui.RequestAlertMessage( - IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, + IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, iPad, &UIScene_PauseMenu::MustSignInReturnedPSN, pParam); #endif } else { -#ifndef __ORBIS__ +#if 1 // 4J-PB - need to check this user can access the store bool bContentRestricted = false; ProfileManager.GetChatAndContentRestrictions( @@ -1310,7 +1296,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned( memset(chKeyName, 0, sizeof(chKeyName)); strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16); -#ifdef __ORBIS__ +#if 0 strcpy(chName, chKeyName); #else sprintf(chName, "%s-%s", app.GetCommerceCategory(), @@ -1319,7 +1305,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned( app.GetDLCSkuIDFromProductList(chName, chSkuID); // 4J-PB - need to check for an empty store -#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__ +#if 0 || 0 || 0 if (app.CheckForEmptyStore(iPad) == false) #endif { @@ -1343,9 +1329,9 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void* pParam, if (bContinue == true) { // Check if we're signed in to LIVE if (ProfileManager.IsSignedInLive(iPad)) { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 -#ifndef __ORBIS__ +#if 1 // 4J-PB - need to check this user can access the store bool bContentRestricted = false; ProfileManager.GetChatAndContentRestrictions( @@ -1389,7 +1375,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void* pParam, memset(chKeyName, 0, sizeof(chKeyName)); strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16); -#ifdef __ORBIS__ +#if 0 strcpy(chName, chKeyName); #else sprintf(chName, "%s-%s", app.GetCommerceCategory(), @@ -1398,7 +1384,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void* pParam, app.GetDLCSkuIDFromProductList(chName, chSkuID); // 4J-PB - need to check for an empty store -#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__ +#if 0 || 0 || 0 if (app.CheckForEmptyStore(iPad) == false) #endif { @@ -1423,16 +1409,16 @@ int UIScene_PauseMenu::ViewInvites_SignInReturned(void* pParam, bool bContinue, if (bContinue == true) { // Check if we're signed in to LIVE if (ProfileManager.IsSignedInLive(iPad)) { -#ifdef __ORBIS__ +#if 0 SQRNetworkManager_Orbis::RecvInviteGUI(); -#elif defined __PS3__ +#elif 0 int ret = sceNpBasicRecvMessageCustom( SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE, SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE, SYS_MEMORY_CONTAINER_ID_INVALID); app.DebugPrintf("sceNpBasicRecvMessageCustom return %d ( %08x )\n", ret, ret); -#else // __PSVITA__ +#else // 0 PSVITA_STUBBED; #endif } @@ -1460,7 +1446,7 @@ int UIScene_PauseMenu::ExitGameSaveDialogReturned( ->getDLCInfoParentPack(); // tPack->getDLCPack(); if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { -#ifdef _XBOX +#if 0 // upsell ULONGLONG ullOfferID_Full; // get the dlc texture pack @@ -1509,7 +1495,7 @@ int UIScene_PauseMenu::ExitGameSaveDialogReturned( &IUIScene_PauseMenu::ExitGameAndSaveReturned, pParam); return 0; } else { -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 StorageManager.SetSaveDisabled(false); #endif MinecraftServer::getInstance()->setSaveOnExit(true); @@ -1537,11 +1523,11 @@ void UIScene_PauseMenu::SetIgnoreInput(bool ignoreInput) { m_bIgnoreInput = ignoreInput; } -#ifdef _XBOX_ONE +#if 0 void UIScene_PauseMenu::HandleDLCLicenseChange() {} #endif -#ifdef __ORBIS__ +#if 0 bool UIScene_PauseMenu::CheckForPatch() { int npAvailability = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad()); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.h index c6171a41f..9e83533c5 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.h @@ -6,12 +6,7 @@ #define BUTTON_PAUSE_RESUMEGAME 0 #define BUTTON_PAUSE_HELPANDOPTIONS 1 #define BUTTON_PAUSE_LEADERBOARDS 2 - -#ifdef _XBOX_ONE -#define BUTTON_PAUSE_XBOXHELP 3 -#else #define BUTTON_PAUSE_ACHIEVEMENTS 3 -#endif #define BUTTON_PAUSE_SAVEGAME 4 #define BUTTON_PAUSE_EXITGAME 5 @@ -25,7 +20,7 @@ private: enum eActions { eAction_None = 0, -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 eAction_ViewLeaderboardsPSN, eAction_ViewInvitesPSN, eAction_SaveGamePSN, @@ -40,18 +35,14 @@ private: UI_MAP_ELEMENT(m_buttons[BUTTON_PAUSE_RESUMEGAME], "Button1") UI_MAP_ELEMENT(m_buttons[BUTTON_PAUSE_HELPANDOPTIONS], "Button2") UI_MAP_ELEMENT(m_buttons[BUTTON_PAUSE_LEADERBOARDS], "Button3") -#ifdef _DURANGO - UI_MAP_ELEMENT(m_buttons[BUTTON_PAUSE_XBOXHELP], "Button4") -#else UI_MAP_ELEMENT(m_buttons[BUTTON_PAUSE_ACHIEVEMENTS], "Button4") -#endif UI_MAP_ELEMENT(m_buttons[BUTTON_PAUSE_SAVEGAME], "Button5") UI_MAP_ELEMENT(m_buttons[BUTTON_PAUSE_EXITGAME], "Button6") UI_END_MAP_ELEMENTS_AND_NAMES() virtual void HandleDLCMountingComplete(); virtual void HandleDLCInstalled(); -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange(); #endif static int UnlockFullSaveReturned(void* pParam, int iPad, @@ -91,7 +82,7 @@ protected: private: void PerformActionSaveGame(); -#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__) +#if 0 || 0 || 0 static int MustSignInReturnedPSN(void* pParam, int iPad, C4JStorage::EMessageResult result); static int ViewLeaderboards_SignInReturned(void* pParam, bool bContinue, @@ -107,7 +98,7 @@ private: #endif protected: -#ifdef _XBOX_ONE +#if 0 static int BanGameDialogReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); virtual long long getDefaultGtcButtons() { @@ -115,7 +106,7 @@ protected: } #endif -#ifdef __ORBIS__ +#if 0 bool CheckForPatch(); #endif -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp index aeed09eed..279989b58 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIScene_QuadrantSignin.h" #include "../../Minecraft.Client/Minecraft.h" -#if defined(__ORBIS__) +#if 0 #include "../Network/Sony/SonyHttp.h" #endif @@ -20,7 +20,7 @@ UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData, _initQuadrants(); -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 if (InputManager.IsCircleCrossSwapped()) { IggyDataValue result; IggyDataValue value[1]; @@ -81,7 +81,7 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_CANCEL: { if (pressed) { -#ifdef _XBOX_ONE +#if 0 if (InputManager.IsPadLocked(iPad)) { if (iPad != ProfileManager.GetPrimaryPad()) { ProfileManager.RemoveGamepadFromGame(iPad); @@ -96,17 +96,17 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, navigateBack(); } } -#ifdef _XBOX_ONE +#if 0 } #endif } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { m_bIgnoreInput = true; -#ifdef _XBOX_ONE +#if 0 if (ProfileManager.IsSignedIn(iPad) && InputManager.IsPadLocked(iPad)) #else @@ -116,7 +116,7 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, app.DebugPrintf("Signed in pad pressed\n"); ProfileManager.CancelProfileAvatarRequest(); -#ifdef _XBOX_ONE +#if 0 // On Durango, if we don't navigate forward here, then // when we are on the main menu, it (re)gains focus & // that causes our users to get cleared @@ -125,7 +125,7 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, navigateBack(); m_signInInfo.Func(m_signInInfo.lpParam, true, m_iPad); } else { -#ifdef _XBOX_ONE +#if 0 if (ProfileManager.IsSignedIn(0) && !InputManager.IsPadLocked(0)) { app.DebugPrintf( @@ -159,7 +159,7 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, handled = true; } -#ifdef _XBOX_ONE +#if 0 int UIScene_QuadrantSignin::SignInReturned(void* pParam, bool bContinue, int iPad, int iController) #else @@ -171,7 +171,7 @@ int UIScene_QuadrantSignin::SignInReturned(void* pParam, bool bContinue, UIScene_QuadrantSignin* pClass = (UIScene_QuadrantSignin*)pParam; -#ifdef _XBOX_ONE +#if 0 if (bContinue && pClass->m_signInInfo.requireOnline && ProfileManager.IsSignedIn(iPad)) { if (!InputManager.IsPadLocked(iPad)) { @@ -189,7 +189,7 @@ int UIScene_QuadrantSignin::SignInReturned(void* pParam, bool bContinue, return 0; } -#ifdef _XBOX_ONE +#if 0 void UIScene_QuadrantSignin::checkAllPrivilegesCallback(LPVOID lpParam, bool hasPrivileges, int iPad) { @@ -217,7 +217,7 @@ void UIScene_QuadrantSignin::updateState() { // app.DebugPrintf("Index %d is signed in, display name - '%s'\n", // i, ProfileManager.GetDisplayName(i).data()); -#ifdef _XBOX_ONE +#if 0 if (!InputManager.IsPadLocked(i)) { setControllerState(i, eControllerStatus_PressToJoin_LoggedIn); } else @@ -307,7 +307,7 @@ void UIScene_QuadrantSignin::_initQuadrants() { if (ProfileManager.IsSignedIn(i)) { app.DebugPrintf("Index %d is signed in\n", i); -#ifdef _XBOX_ONE +#if 0 if (!InputManager.IsPadLocked(i)) { setControllerState(i, eControllerStatus_PressToJoin_LoggedIn); } else diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h index b83a44f82..a2ec711e0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h @@ -107,7 +107,7 @@ public: DWORD dwThumbnailBytes); private: -#ifdef _XBOX_ONE +#if 0 static int SignInReturned(void* pParam, bool bContinue, int iPad, int iController); #else @@ -117,7 +117,7 @@ private: void updateState(); void setControllerState(int iPad, EControllerStatus state); -#ifdef _DURANGO +#if 0 static void checkAllPrivilegesCallback(void* lpParam, bool hasPrivileges, int iPad); #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp index 920791263..fce657082 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp @@ -69,7 +69,7 @@ void UIScene_ReinstallMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.cpp index e8b45d4d8..afe5f2650 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.cpp @@ -37,7 +37,7 @@ UIScene_SaveMessage::UIScene_SaveMessage(int iPad, void* initData, m_bIgnoreInput = false; // 4J-TomK - rebuild touch after auto resize -#ifdef __PSVITA__ +#if 0 ui.TouchBoxRebuild(this); #endif } @@ -57,7 +57,7 @@ void UIScene_SaveMessage::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled) { if (m_bIgnoreInput) return; -#if defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 // ignore all players except player 0 - it's their profile that is currently // being used if (iPad != 0) return; @@ -67,12 +67,12 @@ void UIScene_SaveMessage::handleInput(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); break; - // #ifdef __PS3__ + // #ifdef 0 // case ACTION_MENU_Y: // if(pressed) // { @@ -104,7 +104,7 @@ void UIScene_SaveMessage::handlePress(F64 controlId, F64 childId) { m_bIgnoreInput = true; -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 // wait for the profile to be read - this has been kicked off // earlier, so should be read by now addTimer(PROFILE_LOADED_TIMER_ID, PROFILE_LOADED_TIMER_TIME); @@ -118,7 +118,7 @@ void UIScene_SaveMessage::handlePress(F64 controlId, F64 childId) { void UIScene_SaveMessage::handleTimerComplete(int id) { switch (id) { case PROFILE_LOADED_TIMER_ID: { -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 C4JStorage::eOptionsCallback eStatus = app.GetOptionsCallbackStatus(0); @@ -126,7 +126,7 @@ void UIScene_SaveMessage::handleTimerComplete(int id) { case C4JStorage::eOptions_Callback_Read: case C4JStorage::eOptions_Callback_Read_FileNotFound: case C4JStorage::eOptions_Callback_Read_Fail: -#ifdef __PSVITA__ +#if 0 case C4JStorage::eOptions_Callback_Write_Fail: case C4JStorage::eOptions_Callback_Write: #endif @@ -168,7 +168,7 @@ void UIScene_SaveMessage::handleTimerComplete(int id) { } } -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 int UIScene_SaveMessage::DeleteOptionsDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // UIScene_SaveMessage* pClass = (UIScene_SaveMessage*)pParam; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.h b/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.h index d09d3d428..bd240cd94 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.h @@ -19,7 +19,7 @@ private: UI_MAP_NAME(m_funcAutoResize, L"AutoResize") UI_END_MAP_ELEMENTS_AND_NAMES() -#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) +#if 0 || 0 || 0 static int DeleteOptionsDialogReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); #endif @@ -30,7 +30,7 @@ public: virtual EUIScene getSceneType() { return eUIScene_SaveMessage; } // Returns true if this scene has focus for the pad passed in -#ifndef __PS3__ +#if 1 virtual bool hasFocus(int iPad) { return bHasFocus; } #endif virtual void updateTooltips(); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp index 5c557d089..05cd151c8 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp @@ -72,7 +72,7 @@ void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.cpp index 1a9c93ed3..ca6827960 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.cpp @@ -75,7 +75,7 @@ void UIScene_SettingsControlMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.cpp index 41d84e35f..ee9562a6a 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.cpp @@ -116,7 +116,7 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp index 91a7bc351..cd9b05b55 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp @@ -93,7 +93,7 @@ void UIScene_SettingsMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); @@ -144,8 +144,8 @@ int UIScene_SettingsMenu::ResetDefaultsDialogReturned( // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ - defined __PSVITA__) +#if (0 || 0 || 0 || \ + 0) app.SetDefaultOptions( StorageManager.GetDashboardProfileSettings(pClass->m_iPad), pClass->m_iPad); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.cpp index 1eb2f9509..5750b5331 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIScene_SettingsOptionsMenu.h" -#if defined(_XBOX_ONE) +#if 0 #define _ENABLE_LANGUAGE_SELECT #endif @@ -67,7 +67,7 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, m_sliderAutosave.init(autosaveLabels[ucValue], eControl_Autosave, 0, 8, ucValue); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 removeControl(&m_sliderAutosave, true); #endif @@ -209,7 +209,7 @@ void UIScene_SettingsOptionsMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); @@ -277,7 +277,7 @@ void UIScene_SettingsOptionsMenu::handleReload() { m_sliderAutosave.init(autosaveLabels[ucValue], eControl_Autosave, 0, 8, ucValue); -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if 0 || 0 removeControl(&m_sliderAutosave, true); #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.cpp index f0c229edf..8d700d452 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.cpp @@ -146,7 +146,7 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif sendInputToMovie(key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp index ad927a1dc..d32dc81b8 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp @@ -125,7 +125,7 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: @@ -161,7 +161,7 @@ void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId) { case eControl_Line4: { m_iEditingLine = (int)controlId; m_bIgnoreInput = true; -#ifdef _XBOX_ONE +#if 0 // 4J-PB - Xbox One uses the Windows virtual keyboard, and doesn't // have the Xbox 360 Latin keyboard type, so we can't restrict the // input set to alphanumeric. The closest we get is the @@ -197,13 +197,13 @@ void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId) { } void UIScene_SignEntryMenu::handleDestroy() { -#ifdef __PSVITA__ +#if 0 app.DebugPrintf("missing InputManager.DestroyKeyboard on Vita !!!!!!\n"); #endif // another player destroyed the anvil, so shut down the keyboard if it is // displayed -#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO) +#if (0 || 0 || 0) InputManager.DestroyKeyboard(); #endif } diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp index a1c56db02..b9e0ccb88 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp @@ -2,9 +2,9 @@ #include "UI.h" #include "UIScene_SkinSelectMenu.h" #include "../../Minecraft.World/Util/StringHelpers.h" -#ifdef __ORBIS__ +#if 0 #include -#elif defined __PSVITA__ +#elif 0 #include #endif @@ -33,7 +33,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, m_labelSelected.init(app.GetString(IDS_SELECTED)); -#ifdef __ORBIS__ +#if 0 m_bErrorDialogRunning = false; #endif @@ -86,7 +86,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, m_centreLabel = L""; m_rightLabel = L""; -#ifdef __PSVITA__ +#if 0 // initialise vita tab controls with ids m_TouchTabLeft.init(ETouchInput_TabLeft); m_TouchTabRight.init(ETouchInput_TabRight); @@ -137,7 +137,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, // Display the tooltips -#ifdef __PSVITA__ +#if 0 InitializeCriticalSection( &m_DLCInstallCS); // to prevent a race condition between the install // and the mounted callback @@ -173,7 +173,7 @@ void UIScene_SkinSelectMenu::tick() { // check for new DLC installed // check for the patch error dialog -#ifdef __ORBIS__ +#if 0 // process the error dialog (for a patch being available) if (m_bErrorDialogRunning) { @@ -222,7 +222,7 @@ void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { @@ -434,7 +434,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { // if(true) if (!m_currentPack->hasPurchasedFile( DLCManager::e_DLCType_Skin, skinFile->getPath())) { -#ifdef __ORBIS__ +#if 0 // 4J-PB - Check if there is a patch for the game int errorCode = ProfileManager.getNPAvailability( ProfileManager.GetPrimaryPad()); @@ -474,7 +474,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; -#ifdef __ORBIS__ +#if 0 // Check if PSN is unavailable because of age // restriction int npAvailability = @@ -492,7 +492,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { IDS_PRO_GUESTPROFILE_TITLE, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1, iPad); } -#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ +#if 0 || 0 || 0 // are we online? else if (!ProfileManager.IsSignedInLive(iPad)) { showNotOnlineDialog(iPad); @@ -500,7 +500,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { #endif else { // upsell -#ifdef _XBOX +#if 0 DLC_INFO* pDLCInfo = app.GetDLCInfoForTrialOfferID( m_currentPack->getPurchaseOfferId()); @@ -520,13 +520,13 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { ullOfferID_Full & 0xFFFFFFFF); #endif bool bContentRestricted = false; -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 ProfileManager.GetChatAndContentRestrictions( m_iPad, true, NULL, &bContentRestricted, NULL); #endif if (bContentRestricted) { -#if !(defined(_XBOX) || \ +#if !(0 || \ defined( \ _WIN64)) // 4J Stu - Temp to get the win build running, but so we // check this for other platforms you can't see the store @@ -539,7 +539,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { #endif } else { // 4J-PB - need to check for an empty store -#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__ +#if 0 || 0 || 0 if (app.CheckForEmptyStore(iPad) == false) #endif { @@ -622,11 +622,11 @@ void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion* region) { // region->scissor_y1); app.DebugPrintf("Stencil mask= %d, stencil ref= // %d, stencil write= %d\n", region->stencil_func_mask, // region->stencil_func_ref, region->stencil_write_mask); -#ifdef __PS3__ +#if 0 if (region->stencil_func_ref != 0) RenderManager.StateSetStencil(GL_EQUAL, region->stencil_func_ref, region->stencil_func_mask); -#elif __PSVITA__ +#elif 0 // AP - make sure the skins are only drawn inside the smokey panel if (region->stencil_func_ref != 0) RenderManager.StateSetStencil(SCE_GXM_STENCIL_FUNC_EQUAL, @@ -1273,7 +1273,7 @@ void UIScene_SkinSelectMenu::setRightLabel(const std::wstring& label) { } } -#ifdef __PSVITA__ +#if 0 void UIScene_SkinSelectMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased) { @@ -1403,7 +1403,7 @@ void UIScene_SkinSelectMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, #endif void UIScene_SkinSelectMenu::HandleDLCInstalled() { -#ifdef __PSVITA__ +#if 0 EnterCriticalSection( &m_DLCInstallCS); // to prevent a race condition between the install // and the mounted callback @@ -1426,13 +1426,13 @@ void UIScene_SkinSelectMenu::HandleDLCInstalled() { // this will send a CustomMessage_DLCMountingComplete when done -#ifdef __PSVITA__ +#if 0 LeaveCriticalSection(&m_DLCInstallCS); #endif } void UIScene_SkinSelectMenu::HandleDLCMountingComplete() { -#ifdef __PSVITA__ +#if 0 EnterCriticalSection( &m_DLCInstallCS); // to prevent a race condition between the install // and the mounted callback @@ -1474,17 +1474,17 @@ void UIScene_SkinSelectMenu::HandleDLCMountingComplete() { #if TO_BE_IMPLEMENTED if (bInGame) XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO); #endif -#ifdef __PSVITA__ +#if 0 LeaveCriticalSection(&m_DLCInstallCS); #endif } void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad) { // need to be signed in to live. get them to sign in to online -#if defined(__PS3__) +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn(NULL, this); -#elif defined(__PSVITA__) +#elif 0 if (CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { // we're in adhoc mode, we really need to ask before disconnecting @@ -1499,14 +1499,14 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad) { SQRNetworkManager_Vita::AttemptPSNSignIn(NULL, this); } -#elif defined(__ORBIS__) +#elif 0 SQRNetworkManager_Orbis::AttemptPSNSignIn(NULL, this, false, iPad); -#elif defined(_DURANGO) +#elif 0 unsigned int uiIDA[1] = {IDS_CONFIRM_OK}; ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad); + IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad); #endif } @@ -1518,7 +1518,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned( if ((result == C4JStorage::EMessage_ResultAccept) && ProfileManager.IsSignedIn(iPad)) { if (ProfileManager.IsSignedInLive(iPad)) { -#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ +#if 0 || 0 || 0 // need to get info on the pack to see if the user has already // downloaded it @@ -1546,14 +1546,14 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned( memset(chKeyName, 0, sizeof(chKeyName)); strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16); -#ifdef __ORBIS__ +#if 0 strcpy(chName, chKeyName); #else sprintf(chName, "%s-%s", app.GetCommerceCategory(), chKeyName); #endif app.GetDLCSkuIDFromProductList(chName, chSkuID); -#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__ +#if 0 || 0 || 0 if (app.CheckForEmptyStore(iPad) == false) #endif { @@ -1574,7 +1574,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned( pScene->m_bIgnoreInput = false; // MGH - moved this to outside the pSONYDLCInfo, so we // don't get stuck -#elif defined _XBOX_ONE +#elif 0 StorageManager.InstallOffer( 1, const_cast( @@ -1642,24 +1642,24 @@ void UIScene_SkinSelectMenu::handleReload() { handlePackIndexChanged(); } -#ifdef _XBOX_ONE +#if 0 void UIScene_SkinSelectMenu::HandleDLCLicenseChange() { // update the lock flag handleSkinIndexChanged(); } #endif -#ifdef __PSVITA__ +#if 0 int UIScene_SkinSelectMenu::MustSignInReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { if (result == C4JStorage::EMessage_ResultAccept) { -#ifdef __PS3__ +#if 0 SQRNetworkManager_PS3::AttemptPSNSignIn( &UIScene_SkinSelectMenu::PSNSignInReturned, pParam, true); -#elif defined __PSVITA__ +#elif 0 SQRNetworkManager_Vita::AttemptPSNSignIn( &UIScene_SkinSelectMenu::PSNSignInReturned, pParam, true); -#elif defined __ORBIS__ +#elif 0 SQRNetworkManager_Orbis::AttemptPSNSignIn( &UIScene_SkinSelectMenu::PSNSignInReturned, pParam, true); #endif @@ -1673,4 +1673,4 @@ int UIScene_SkinSelectMenu::PSNSignInReturned(void* pParam, bool bContinue, } return 0; } -#endif // __PSVITA__ \ No newline at end of file +#endif // 0 \ No newline at end of file diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h index 40feb631b..d7158d582 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h @@ -12,7 +12,7 @@ private: // 4J Stu - How many to show on each side of the main control static const int sidePreviewControls = 4; -#ifdef __PSVITA__ +#if 0 enum ETouchInput { ETouchInput_TabLeft = 10, ETouchInput_TabRight, @@ -49,14 +49,14 @@ private: UIControl_Label m_labelSelected; UIControl m_controlSkinNamePlate, m_controlSelectedPanel, m_controlIggyCharacters, m_controlTimer; -#ifdef __PSVITA__ +#if 0 UIControl_Touch m_TouchTabLeft, m_TouchTabRight, m_TouchTabCenter, m_TouchIggyCharacters; #endif IggyName m_funcSetPlayerCharacterSelected, m_funcSetCharacterLocked; IggyName m_funcSetLeftLabel, m_funcSetRightLabel, m_funcSetCentreLabel; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) -#ifdef __PSVITA__ +#if 0 UI_MAP_ELEMENT(m_TouchTabLeft, "TouchTabLeft") UI_MAP_ELEMENT(m_TouchTabRight, "TouchTabRight") UI_MAP_ELEMENT(m_TouchTabCenter, "TouchTabCenter") @@ -120,7 +120,7 @@ private: public: UIScene_SkinSelectMenu(int iPad, void* initData, UILayer* parentLayer); -#ifdef __PSVITA__ +#if 0 virtual ~UIScene_SkinSelectMenu() { DeleteCriticalSection(&m_DLCInstallCS); } @@ -167,7 +167,7 @@ private: virtual void HandleDLCMountingComplete(); virtual void HandleDLCInstalled(); -#ifdef _XBOX_ONE +#if 0 virtual void HandleDLCLicenseChange(); #endif @@ -179,23 +179,23 @@ private: void AddFavoriteSkin(int iPad, int iSkinID); void InputActionOK(unsigned int iPad); -#ifdef __PSVITA__ +#if 0 virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); -#endif //__PSVITA__ +#endif //0 virtual void handleReload(); -#ifdef __ORBIS__ +#if 0 bool m_bErrorDialogRunning; #endif -#ifdef __PSVITA__ +#if 0 static int MustSignInReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); static int PSNSignInReturned(void* pParam, bool bContinue, int iPad); #endif -#ifdef __PSVITA__ +#if 0 CRITICAL_SECTION m_DLCInstallCS; // to prevent a race condition between the // install and the mounted callback #endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp index 6b7241b6b..cd33b4c1e 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp @@ -218,7 +218,7 @@ void UIScene_TeleportMenu::handleInput(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif case ACTION_MENU_UP: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp index 2eea5bb91..0800642ed 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp @@ -57,7 +57,7 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, // success or fail ui.OverrideSFX(m_iPad, ACTION_MENU_A, true); ui.OverrideSFX(m_iPad, ACTION_MENU_OK, true); -#ifdef __ORBIS__ +#if 0 ui.OverrideSFX(m_iPad, ACTION_MENU_TOUCHPAD_PRESS, true); #endif ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT_SCROLL, true); @@ -103,7 +103,7 @@ void UIScene_TradingMenu::handleDestroy() { ui.OverrideSFX(m_iPad, ACTION_MENU_A, false); ui.OverrideSFX(m_iPad, ACTION_MENU_OK, false); -#ifdef __ORBIS__ +#if 0 ui.OverrideSFX(m_iPad, ACTION_MENU_TOUCHPAD_PRESS, false); #endif ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT_SCROLL, false); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp index 4287246ff..9bb2f59e5 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp @@ -32,7 +32,7 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, navigateBack(); break; case ACTION_MENU_OK: -#ifdef __ORBIS__ +#if 0 case ACTION_MENU_TOUCHPAD_PRESS: #endif if (pressed) { @@ -47,7 +47,7 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, ui.PlayUISFX(eSFX_Press); // 4J-PB - need to check this user can access the store -#if defined(__PS3__) || defined(__PSVITA__) +#if 0 || 0 bool bContentRestricted; ProfileManager.GetChatAndContentRestrictions( ProfileManager.GetPrimaryPad(), true, NULL, diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.h b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.h index ed447abf8..96562b5d9 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.h @@ -13,7 +13,7 @@ public: virtual EUIScene getSceneType() { return eUIScene_TrialExitUpsell; } // Returns true if this scene has focus for the pad passed in -#ifndef __PS3__ +#if 1 virtual bool hasFocus(int iPad) { return bHasFocus; } #endif virtual void updateTooltips(); diff --git a/Minecraft.Client/Platform/Common/UI/UIString.cpp b/Minecraft.Client/Platform/Common/UI/UIString.cpp index 676798713..3155f9426 100644 --- a/Minecraft.Client/Platform/Common/UI/UIString.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIString.cpp @@ -82,7 +82,7 @@ int UIString::s_currentLocale = -1; UIString::UIString() { m_core = std::shared_ptr(); } UIString::UIString(int ids) { -#ifdef __PS3__ +#if 0 StringBuilder builder = StringBuilder(new IdsStringBuilder(ids)); #else StringBuilder builder = [ids]() { return app.GetString(ids); }; @@ -114,7 +114,7 @@ UIString::UIString(const wchar_t* constant) { } UIString::~UIString() { -#ifndef __PS3__ +#if 1 m_core = nullptr; #endif } diff --git a/Minecraft.Client/Platform/Common/UI/UIString.h b/Minecraft.Client/Platform/Common/UI/UIString.h index f493c07b9..7143c3fb9 100644 --- a/Minecraft.Client/Platform/Common/UI/UIString.h +++ b/Minecraft.Client/Platform/Common/UI/UIString.h @@ -3,7 +3,7 @@ #include #include -#ifndef __PS3__ +#if 1 typedef std::function StringBuilder; diff --git a/Minecraft.Client/Platform/Common/UI/UIStructs.h b/Minecraft.Client/Platform/Common/UI/UIStructs.h index 18f7e5d50..a63b435f3 100644 --- a/Minecraft.Client/Platform/Common/UI/UIStructs.h +++ b/Minecraft.Client/Platform/Common/UI/UIStructs.h @@ -210,12 +210,12 @@ typedef struct _SaveListDetails { int saveId; std::uint8_t* pbThumbnailData; unsigned int dwThumbnailSize; -#ifdef _DURANGO +#if 0 wchar_t UTF16SaveName[128]; wchar_t UTF16SaveFilename[MAX_SAVEFILENAME_LENGTH]; #else char UTF8SaveName[128]; -#ifndef _XBOX +#if 1 char UTF8SaveFilename[MAX_SAVEFILENAME_LENGTH]; #endif #endif @@ -224,13 +224,13 @@ typedef struct _SaveListDetails { saveId = 0; pbThumbnailData = NULL; dwThumbnailSize = 0; -#ifdef _DURANGO +#if 0 ZeroMemory(UTF16SaveName, sizeof(wchar_t) * 128); ZeroMemory(UTF16SaveFilename, sizeof(wchar_t) * MAX_SAVEFILENAME_LENGTH); #else ZeroMemory(UTF8SaveName, 128); -#ifndef _XBOX +#if 1 ZeroMemory(UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH); #endif #endif @@ -357,12 +357,12 @@ typedef struct _LoadingInputParams { } LoadingInputParams; // Tutorial -#ifndef _XBOX +#if 1 class UIScene; #endif class Tutorial; typedef struct _TutorialPopupInfo { -#ifdef _XBOX +#if 0 CXuiScene* interactScene; #else UIScene* interactScene; diff --git a/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h b/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h index 2ea670dfb..9784fe2fc 100644 --- a/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h +++ b/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h @@ -135,7 +135,7 @@ public: { wcsncpy_s( wValue, pAttributes[i].strValue, pAttributes[i].ValueLen); -#ifdef _XBOX +#if 0 iValue=_wtoi(wValue); #else iValue=wcstol(wValue, NULL, 10); @@ -283,7 +283,7 @@ public: { wcsncpy_s( wConfig, pAttributes[i].strValue, pAttributes[i].ValueLen); -#ifdef _XBOX +#if 0 iConfig=_wtoi(wConfig); #else iConfig=wcstol(wConfig, NULL, 10);