LegacyConsole/GabsPuNs-Project_Zenith_Main
3
0
Fork 0
mirror of https://github.com/GabsPuNs/Project-Zenith-Main.git synced 2026-05-31 15:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup

Browse Source 
Just a bit. i dont want to clean all the ifdef for consoles right now
This commit is contained in:
GabsPuNs
2026-05-28 18:52:42 -04:00
parent d1dbe882bb
commit 7c3e4fb0d5
24 changed files with 60 additions and 4112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Minecraft.Client/Minecraft.cpp
View File

@@ -1746,27 +1746,6 @@ void Minecraft::run_middle()
#ifndef _XBOX
ui.HidePressStart();
#endif
#ifdef __ORBIS__
int npAvailability = ProfileManager.getNPAvailability(i);
// Check if PSN is unavailable because of age restriction
if (npAvailability == SCE_NP_ERROR_AGE_RESTRICTION)
{
UINT uiIDA[1];
uiIDA[0] = IDS_OK;
ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, i);
}
else if (ProfileManager.IsSignedIn(i) && !ProfileManager.IsSignedInLive(i))
{
// You're not signed in to PSN!
UINT uiIDA[2];
uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT;
uiIDA[1] = IDS_CANCEL;
ui.RequestAlertMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, i,&Minecraft::MustSignInReturnedPSN, this);
}
else
#endif
{
UINT uiIDA[1];
uiIDA[0]=IDS_CONFIRM_OK;
@@ -4380,13 +4359,6 @@ void Minecraft::setLevel(MultiPlayerLevel *level, int message /*=-1*/, shared_pt
PlayerUID playerXUIDOnline = INVALID_XUID;
ProfileManager.GetXUID(iPrimaryPlayer,&playerXUIDOffline,false);
ProfileManager.GetXUID(iPrimaryPlayer,&playerXUIDOnline,true);
#ifdef __PSVITA__
if(CGameNetworkManager::usingAdhocMode() && playerXUIDOnline.getOnlineID()[0] == 0)
{
// player doesn't have an online UID, set it from the player name
playerXUIDOnline.setForAdhoc();
}
#endif
#ifdef _WINDOWS64
// On Windows, the implementation has been changed to use a per-client pseudo XUID based on `uid.dat`.
// To maintain player data compatibility with existing worlds, the world host (the first player) will use the previous embedded pseudo XUID.
@@ -5262,19 +5234,4 @@ ColourTable *Minecraft::getColourTable()
}
return colours;
}
#if defined __ORBIS__
int Minecraft::MustSignInReturnedPSN(void *pParam, int iPad, C4JStorage::EMessageResult result)
{
Minecraft* pMinecraft = (Minecraft *)pParam;
if(result == C4JStorage::EMessage_ResultAccept)
{
SQRNetworkManager_Orbis::AttemptPSNSignIn(&Minecraft::InGame_SignInReturned, pMinecraft, false, iPad);
}
return 0;
}
#endif
}