Skip to content

Commit aeaa412

Browse files
committed
Added Single as default scene loading mode
1 parent 320500b commit aeaa412

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

Assets/BossRoom/Scripts/Client/Game/State/ClientCharSelectState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ public void OnPlayerExit()
403403
// first disconnect then return to menu
404404
var gameNetPortal = GameObject.FindGameObjectWithTag("GameNetPortal").GetComponent<GameNetPortal>();
405405
gameNetPortal.RequestDisconnect();
406-
SceneLoaderWrapper.Instance.LoadScene("MainMenu", LoadSceneMode.Single);
406+
SceneLoaderWrapper.Instance.LoadScene("MainMenu");
407407
}
408408

409409
GameObject GetCharacterGraphics(Avatar avatar)

Assets/BossRoom/Scripts/Client/UI/PostGameUI.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void SetPostGameUI(WinState winState)
7777
public void OnPlayAgainClicked()
7878
{
7979
// this should only ever be called by the Host - so just go ahead and switch scenes
80-
SceneLoaderWrapper.Instance.LoadScene("CharSelect", LoadSceneMode.Single);
80+
SceneLoaderWrapper.Instance.LoadScene("CharSelect");
8181

8282
// FUTURE: could be improved to better support a dedicated server architecture
8383
}
@@ -88,7 +88,7 @@ public void OnMainMenuClicked()
8888
var gameNetPortal = GameObject.FindGameObjectWithTag("GameNetPortal").GetComponent<GameNetPortal>();
8989
gameNetPortal.RequestDisconnect();
9090

91-
SceneLoaderWrapper.Instance.LoadScene("MainMenu", LoadSceneMode.Single);
91+
SceneLoaderWrapper.Instance.LoadScene("MainMenu");
9292
}
9393
}
9494
}

Assets/BossRoom/Scripts/Server/Game/State/ServerBossRoomState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ private IEnumerator CoroGameOver(float wait, bool gameWon)
257257

258258
SetWinState(gameWon ? WinState.Win : WinState.Loss);
259259

260-
SceneLoaderWrapper.Instance.LoadScene("PostGame", LoadSceneMode.Single);
260+
SceneLoaderWrapper.Instance.LoadScene("PostGame");
261261
}
262262
}
263263
}

Assets/BossRoom/Scripts/Server/Game/State/ServerCharSelectState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private void SaveLobbyResults()
145145
private IEnumerator WaitToEndLobby()
146146
{
147147
yield return new WaitForSeconds(3);
148-
SceneLoaderWrapper.Instance.LoadScene("BossRoom", LoadSceneMode.Single);
148+
SceneLoaderWrapper.Instance.LoadScene("BossRoom");
149149
}
150150

151151
public override void OnNetworkDespawn()

Assets/BossRoom/Scripts/Server/ServerTestingHotkeys.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private void Update()
5757
}
5858
if (m_InstantQuitKeyCode != KeyCode.None && Input.GetKeyDown(m_InstantQuitKeyCode))
5959
{
60-
SceneLoaderWrapper.Instance.LoadScene("PostGame", LoadSceneMode.Single);
60+
SceneLoaderWrapper.Instance.LoadScene("PostGame");
6161
}
6262
}
6363
}

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private void OnDisconnectOrTimeout(ulong clientID)
130130
DisconnectReason.SetDisconnectReason(ConnectStatus.GenericDisconnect);
131131
}
132132

133-
SceneLoaderWrapper.Instance.LoadScene("MainMenu", LoadSceneMode.Single);
133+
SceneLoaderWrapper.Instance.LoadScene("MainMenu");
134134
}
135135
else if (DisconnectReason.Reason == ConnectStatus.GenericDisconnect || DisconnectReason.Reason == ConnectStatus.Undefined)
136136
{

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ServerGameNetPortal.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void OnNetworkReady()
6969

7070
//The "BossRoom" server always advances to CharSelect immediately on start. Different games
7171
//may do this differently.
72-
SceneLoaderWrapper.Instance.LoadScene("CharSelect", LoadSceneMode.Single);
72+
SceneLoaderWrapper.Instance.LoadScene("CharSelect");
7373

7474
if( m_Portal.NetManager.IsHost)
7575
{

Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/SceneLoaderWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void AddOnSceneEventCallback()
6565
/// </summary>
6666
/// <param name="sceneName">Name or path of the Scene to load.</param>
6767
/// <param name="loadSceneMode">If LoadSceneMode.Single then all current Scenes will be unloaded before loading.</param>
68-
public void LoadScene(string sceneName, LoadSceneMode loadSceneMode)
68+
public void LoadScene(string sceneName, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
6969
{
7070
if (NetworkManager != null && NetworkManager.IsListening && NetworkManager.NetworkConfig.EnableSceneManagement)
7171
{

0 commit comments

Comments
 (0)