load game after showing host popup

This commit is contained in:
JohnCorby 2022-04-05 17:46:24 -07:00
parent a97e869850
commit 1c9a7e3e7c

View File

@ -4,7 +4,6 @@ using QSB.Messaging;
using QSB.Player.TransformSync; using QSB.Player.TransformSync;
using QSB.SaveSync.Messages; using QSB.SaveSync.Messages;
using QSB.Utility; using QSB.Utility;
using QSB.WorldSync;
using System; using System;
using System.Text; using System.Text;
using UnityEngine; using UnityEngine;
@ -40,7 +39,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
private const string DisconnectString = "DISCONNECT"; private const string DisconnectString = "DISCONNECT";
private const string StopHostingString = "STOP HOSTING"; private const string StopHostingString = "STOP HOSTING";
private Action PopupOK; private Action PopupClose;
private bool _intentionalDisconnect; private bool _intentionalDisconnect;
@ -148,8 +147,8 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
OWTime.Unpause(OWTime.PauseType.Menu); OWTime.Unpause(OWTime.PauseType.Menu);
OWInput.RestorePreviousInputs(); OWInput.RestorePreviousInputs();
PopupOK?.SafeInvoke(); PopupClose?.SafeInvoke();
PopupOK = null; PopupClose = null;
} }
private void CreateCommonPopups() private void CreateCommonPopups()
@ -275,11 +274,15 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
QSBNetworkManager.singleton.StartHost(); QSBNetworkManager.singleton.StartHost();
if (!QSBCore.DebugSettings.UseKcpTransport && false/*temp*/) if (!QSBCore.DebugSettings.UseKcpTransport)
{ {
var productUserId = EOSSDKComponent.LocalUserProductIdString; var productUserId = EOSSDKComponent.LocalUserProductIdString;
PopupOK += () => GUIUtility.systemCopyBuffer = productUserId; PopupClose += () =>
{
GUIUtility.systemCopyBuffer = productUserId;
LoadGame(PlayerData.GetWarpedToTheEye());
};
OpenInfoPopup("Hosting server.\r\nClients will connect using your product user id, which is :\r\n" + OpenInfoPopup("Hosting server.\r\nClients will connect using your product user id, which is :\r\n" +
$"{productUserId}\r\n" + $"{productUserId}\r\n" +
@ -287,8 +290,6 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
, "YES" , "YES"
, "NO"); , "NO");
} }
LoadGame(PlayerData.GetWarpedToTheEye());
} }
private void Connect() private void Connect()
@ -327,7 +328,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
{ {
_intentionalDisconnect = true; _intentionalDisconnect = true;
PopupOK += () => PopupClose += () =>
{ {
if (QSBSceneManager.IsInUniverse) if (QSBSceneManager.IsInUniverse)
{ {
@ -347,7 +348,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
} }
else else
{ {
PopupOK += () => PopupClose += () =>
{ {
if (QSBSceneManager.IsInUniverse) if (QSBSceneManager.IsInUniverse)
{ {