forked from cafeberry/cafeberry
added 360 support and fixed vita again again
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "stdafx.h"
|
||||
#include "Common\LivePrivileges.h"
|
||||
#include "Minecraft.h"
|
||||
#include "GameMode.h"
|
||||
#include "Timer.h"
|
||||
@@ -1486,7 +1487,7 @@ void Minecraft::run_middle()
|
||||
if(ProfileManager.IsSignedIn(i))
|
||||
{
|
||||
// if this is a local game, then the player just needs to be signed in
|
||||
if( g_NetworkManager.IsLocalGame() || (ProfileManager.IsSignedInLive(i) && ProfileManager.AllowedToPlayMultiplayer(i) ) )
|
||||
if( g_NetworkManager.IsLocalGame() || Live_MultiplayerAllowed(i) )
|
||||
{
|
||||
#ifdef __ORBIS__
|
||||
bool contentRestricted = false;
|
||||
@@ -1539,7 +1540,7 @@ void Minecraft::run_middle()
|
||||
}
|
||||
else
|
||||
{
|
||||
if( ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && !ProfileManager.AllowedToPlayMultiplayer(i) )
|
||||
if( ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && !Live_AllowedToPlayMultiplayer(i) )
|
||||
{
|
||||
ProfileManager.RequestConvertOfflineToGuestUI( &Minecraft::InGame_SignInReturned, this,i);
|
||||
// 4J Stu - Don't allow converting to guests as we don't allow any guest sign-in while in the game
|
||||
@@ -4814,7 +4815,7 @@ void Minecraft::inGameSignInCheckAllPrivilegesCallback(LPVOID lpParam, bool hasP
|
||||
ui.RequestErrorMessage(IDS_MULTIPLAYER_FULL_TITLE, IDS_MULTIPLAYER_FULL_TEXT, uiIDA, 1);
|
||||
ProfileManager.RemoveGamepadFromGame(iPad);
|
||||
}
|
||||
else if( ProfileManager.IsSignedInLive(iPad) && ProfileManager.AllowedToPlayMultiplayer(iPad) )
|
||||
else if( Live_MultiplayerAllowed(iPad) )
|
||||
{
|
||||
// create the local player for the iPad
|
||||
shared_ptr<Player> player = pClass->localplayers[iPad];
|
||||
@@ -4878,7 +4879,7 @@ int Minecraft::InGame_SignInReturned(void *pParam,bool bContinue, int iPad)
|
||||
#endif
|
||||
}
|
||||
// if this is a local game then profiles just need to be signed in
|
||||
else if( g_NetworkManager.IsLocalGame() || (ProfileManager.IsSignedInLive(iPad) && ProfileManager.AllowedToPlayMultiplayer(iPad)) )
|
||||
else if( g_NetworkManager.IsLocalGame() || Live_MultiplayerAllowed(iPad) )
|
||||
{
|
||||
#ifdef __ORBIS__
|
||||
bool contentRestricted = false;
|
||||
@@ -4909,7 +4910,7 @@ int Minecraft::InGame_SignInReturned(void *pParam,bool bContinue, int iPad)
|
||||
}
|
||||
}
|
||||
}
|
||||
else if( ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && !ProfileManager.AllowedToPlayMultiplayer(iPad) )
|
||||
else if( ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && !Live_AllowedToPlayMultiplayer(iPad) )
|
||||
{
|
||||
// 4J Stu - Don't allow converting to guests as we don't allow any guest sign-in while in the game
|
||||
// Fix for #66516 - TCR #124: MPS Guest Support ; #001: BAS Game Stability: TU8: The game crashes when second Guest signs-in on console which takes part in Xbox LIVE multiplayer session.
|
||||
|
||||
Reference in New Issue
Block a user