backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-01 20:57:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup: collapse common app and ui console branches

Browse source
This commit is contained in:
MatthewBeshay 2026-03-26 18:49:24 +11:00
parent ad5da38321
commit 6ef7d05f7e
148 changed files with 1389 additions and 1489 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Minecraft.Client/Minecraft.cpp
View file

@ -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;

32
Minecraft.Client/MinecraftServer.cpp
View file

@ -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);

4
Minecraft.Client/Platform/Common/App_Defines.h
View file

@ -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

8
Minecraft.Client/Platform/Common/App_enums.h
View file

@ -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

8
Minecraft.Client/Platform/Common/App_structs.h
View file

@ -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,

66
Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
View file

@ -10,7 +10,7 @@
#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
#include "../DLC/DLCAudioFile.h"
#ifdef __PSVITA__
#if 0
#include <audioout.h>
#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<Mob>* players, float a) {
return;
#endif
#ifdef __PSVITA__
#if 0
EnterCriticalSection(&SoundEngine_MixerMutex);
#endif
@ -1541,7 +1541,7 @@ void SoundEngine::tick(std::shared_ptr<Mob>* 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

6
Minecraft.Client/Platform/Common/Audio/SoundEngine.h
View file

@ -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
};

2
Minecraft.Client/Platform/Common/Audio/SoundNames.cpp
View file

@ -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

2
Minecraft.Client/Platform/Common/Console_Awards_enum.h
View file

@ -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,

2
Minecraft.Client/Platform/Common/Console_Utils.cpp
View file

@ -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];

446
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

File diff suppressed because it is too large Load diff

52
Minecraft.Client/Platform/Common/Consoles_App.h
View file

@ -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<PlayerUID, std::uint8_t*, PlayerUID::Hash> m_GTS_Files;
#else
std::unordered_map<PlayerUID, std::uint8_t*> 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<SCreditTextItemDef*> vDLCCredits;
#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
#if 0 || 0 || 0
static std::unordered_map<PlayerUID, MOJANG_DATA*, PlayerUID::Hash>
MojangData;
static std::unordered_map<int, char*>
@ -789,7 +789,7 @@ private:
static std::unordered_map<std::string, DLC_INFO*> DLCInfo;
static std::unordered_map<std::wstring, ULONGLONG>
DLCInfo_SkinName; // skin name, full offer id
#elif defined(_DURANGO)
#elif 0
static std::unordered_map<PlayerUID, MOJANG_DATA*, PlayerUID::Hash>
MojangData;
static std::unordered_map<int, std::wstring>
@ -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<std::wstring, DLC_INFO*>* 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<std::uint8_t*> 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();

2
Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp
View file

@ -4,7 +4,7 @@
#include <cstring>
#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

4
Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
View file

@ -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;

2
Minecraft.Client/Platform/Common/DLC/DLCManager.h
View file

@ -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);

8
Minecraft.Client/Platform/Common/DLC/DLCPack.cpp
View file

@ -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;

6
Minecraft.Client/Platform/Common/DLC/DLCPack.h
View file

@ -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; }

4
Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp
View file

@ -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);

10
Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp
View file

@ -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");

4
Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
View file

@ -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");

2
Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.cpp
View file

@ -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"

8
Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.h
View file

@ -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:

22
Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp
View file

@ -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<sce::Toolkit::NP::FriendsList>
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

4
Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h
View file

@ -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<sce::Toolkit::NP::FriendsList>&
friendsList) = 0;

116
Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
View file

@ -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();

14
Minecraft.Client/Platform/Common/Network/GameNetworkManager.h
View file

@ -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

4
Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h
View file

@ -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
};

2
Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp
View file

@ -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);

2
Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h
View file

@ -193,7 +193,7 @@ public:
private:
void NotifyPlayerJoined(IQNetPlayer* pQNetPlayer);
#ifndef _XBOX
#if 1
void FakeLocalPlayerJoined() {
NotifyPlayerJoined(m_pIQNet->GetLocalPlayerByUserIndex(0));
}

12
Minecraft.Client/Platform/Common/Network/SessionInfo.h
View file

@ -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;

4
Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp
View file

@ -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<int>(SystemTimeAsFileTime.dwLowDateTime);

2
Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp
View file

@ -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,

24
Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
View file

@ -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);
}

8
Minecraft.Client/Platform/Common/Tutorial/Tutorial.h
View file

@ -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<TutorialTask*>* getTasks();
unsigned int getCurrentTaskIndex();
#ifdef _XBOX
#if 0
CXuiScene* getScene() { return m_UIScene; }
#else
UIScene* getScene() { return m_UIScene; }

6
Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.cpp
View file

@ -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<IUIScene_CraftingMenu *>(tutorial->getScene());
#ifdef _XBOX
#if 0
CXuiSceneCraftingPanel* craftScene =
(CXuiSceneCraftingPanel*)(tutorial->getScene());
#else

2
Minecraft.Client/Platform/Common/UI/IUIController.h
View file

@ -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;

14
Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp
View file

@ -9,7 +9,7 @@
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Minecraft.h"
#ifdef __ORBIS__
#if 0
#include <pad.h>
#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) {

2
Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.h
View file

@ -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

6
Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.cpp
View file

@ -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

52
Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp
View file

@ -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<IUIScene_PauseMenu*>(
@ -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<IUIScene_PauseMenu*>(
@ -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<IUIScene_PauseMenu*>(
@ -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<IUIScene_PauseMenu*>(
@ -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;

16
Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.cpp
View file

@ -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<wchar_t*>(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());
}
}

2
Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.cpp
View file

@ -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()) {

4
Minecraft.Client/Platform/Common/UI/UI.h
View file

@ -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"

10
Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
View file

@ -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;

6
Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.cpp
View file

@ -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()));

12
Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp
View file

@ -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];

6
Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.h
View file

@ -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

4
Minecraft.Client/Platform/Common/UI/UIControl.cpp
View file

@ -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) {

2
Minecraft.Client/Platform/Common/UI/UIControl.h
View file

@ -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; }

2
Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp
View file

@ -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) {

4
Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp
View file

@ -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];

2
Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.h
View file

@ -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

2
Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp
View file

@ -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) {

2
Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp
View file

@ -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) {

2
Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.cpp
View file

@ -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) {

6
Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp
View file

@ -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];

4
Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.h
View file

@ -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
};

2
Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.cpp
View file

@ -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);

2
Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp
View file

@ -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) {

2
Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp
View file

@ -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) {

2
Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp
View file

@ -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) {

82
Minecraft.Client/Platform/Common/UI/UIController.cpp
View file

@ -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 <message_dialog.h>
#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<<eDebugSetting_ToggleFont) &&
@ -1276,18 +1276,18 @@ void UIController::setupCustomDrawGameState() {
m_customRenderingClearRect.top = LONG_MAX;
m_customRenderingClearRect.bottom = LONG_MIN;
#if defined _WINDOWS64 || _DURANGO
#if defined _WINDOWS64 || 0
PIXBeginNamedEvent(0, "StartFrame");
RenderManager.StartFrame();
PIXEndNamedEvent();
gdraw_D3D11_setViewport_4J();
#elif defined __PS3__
#elif 0
RenderManager.StartFrame();
#elif defined __PSVITA__
#elif 0
RenderManager.StartFrame();
#elif defined __linux__
RenderManager.StartFrame();
#elif defined __ORBIS__
#elif 0
RenderManager.StartFrame(false);
// Set up a viewport for the render that matches Iggy's own viewport, apart
// form using an opengl-style z-range (Iggy uses a DX-style range on PS4),
@ -1324,7 +1324,7 @@ void UIController::setupCustomDrawMatrices(UIScene* scene,
float sceneHeight = (float)scene->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();

6
Minecraft.Client/Platform/Common/UI/UIController.h
View file

@ -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);

10
Minecraft.Client/Platform/Common/UI/UIEnums.h
View file

@ -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

4
Minecraft.Client/Platform/Common/UI/UIFontData.cpp
View file

@ -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",

8
Minecraft.Client/Platform/Common/UI/UIGroup.cpp
View file

@ -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;

6
Minecraft.Client/Platform/Common/UI/UIGroup.h
View file

@ -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);

14
Minecraft.Client/Platform/Common/UI/UILayer.cpp
View file

@ -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;

8
Minecraft.Client/Platform/Common/UI/UILayer.h
View file

@ -17,7 +17,7 @@ private:
std::vector<UIScene*>
m_scenesToDestroy; // A list of scenes where we want to dump the swf
#ifdef __ORBIS__
#if 0
std::unordered_map<EUIScene, std::pair<int, bool>, std::hash<int>>
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);

30
Minecraft.Client/Platform/Common/UI/UIScene.cpp
View file

@ -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++) {

8
Minecraft.Client/Platform/Common/UI/UIScene.h
View file

@ -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

8
Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp
View file

@ -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

6
Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp
View file

@ -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();

10
Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp
View file

@ -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) {

2
Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.h
View file

@ -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

36
Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp
View file

@ -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);

4
Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h
View file

@ -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
{

10
Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp
View file

@ -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,

6
Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.h
View file

@ -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")

64
Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
View file

@ -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;

4
Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h
View file

@ -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,

6
Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp
View file

@ -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,

4
Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.h
View file

@ -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();

32
Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp
View file

@ -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:

8
Minecraft.Client/Platform/Common/UI/UIScene_Credits.h
View file

@ -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)

40
Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp
View file

@ -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
}
}

2
Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.h
View file

@ -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

72
Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp
View file

@ -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<SonyCommerce::ProductInfo>::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<SonyCommerce::ProductInfo>::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
#endif

8
Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.h
View file

@ -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<SonyCommerce::ProductInfo>* m_pvProductInfo;
#endif
};

6
Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.cpp
View file

@ -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;

2
Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.h
View file

@ -34,7 +34,7 @@ public:
protected:
void handlePress(F64 controlId, F64 childId);
#ifdef _DURANGO
#if 0
virtual long long getDefaultGtcButtons() { return 0; }
#endif
};

12
Minecraft.Client/Platform/Common/UI/UIScene_EULA.cpp
View file

@ -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:

2
Minecraft.Client/Platform/Common/UI/UIScene_EULA.h
View file

@ -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();

8
Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp
View file

@ -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) {

2
Minecraft.Client/Platform/Common/UI/UIScene_HUD.h
View file

@ -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;
}

4
Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp
View file

@ -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

10
Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp
View file

@ -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
}

6
Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp
View file

@ -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);

2
Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.h
View file

@ -32,7 +32,7 @@ private:
eHTPButton_Droppers,
eHTPButton_NetherPortal,
eHTPButton_TheEnd,
#ifdef _XBOX
#if 0
eHTPButton_SocialMedia,
eHTPButton_BanningLevels,
#endif

2
Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp
View file

@ -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);

Some files were not shown because too many files have changed in this diff Show more