vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed NullReferenceExceptions if in the netlobby when a round ends, fixed chatmsgbox staying disabled after being stunned

Browse Source
This commit is contained in:
Regalis
2016-08-16 20:18:19 +03:00
parent 6c5452570e
commit 26b6847bca
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/GUI/GUI.cs
+2
View File
@@ -200,6 +200,8 @@ namespace Barotrauma
GameMain.NetworkMember = null; GameMain.NetworkMember = null;
} }
GameMain.GameSession = null;
GameMain.MainMenuScreen.Select(); GameMain.MainMenuScreen.Select();
//Game1.MainMenuScreen.SelectTab(null, (int)MainMenuScreen.Tabs.Main); //Game1.MainMenuScreen.SelectTab(null, (int)MainMenuScreen.Tabs.Main);
Subsurface/Source/GameSession/GameSession.cs
+5 -5
View File
@@ -164,18 +164,18 @@ namespace Barotrauma
{ {
if (Mission != null) Mission.End(); if (Mission != null) Mission.End();
if (GameMain.Server!=null) if (GameMain.Server != null)
{ {
CoroutineManager.StartCoroutine(GameMain.Server.EndGame(endMessage)); CoroutineManager.StartCoroutine(GameMain.Server.EndGame(endMessage));
} }
else if (GameMain.Client==null) else if (GameMain.Client == null)
{ {
//Submarine.Unload(); //Submarine.Unload();
GameMain.LobbyScreen.Select(); GameMain.LobbyScreen.Select();
} }
if (shiftSummary!=null) if (shiftSummary != null)
{ {
GUIFrame summaryFrame = shiftSummary.CreateSummaryFrame(endMessage); GUIFrame summaryFrame = shiftSummary.CreateSummaryFrame(endMessage);
GUIMessageBox.MessageBoxes.Enqueue(summaryFrame); GUIMessageBox.MessageBoxes.Enqueue(summaryFrame);
Subsurface/Source/Networking/NetworkMember.cs
+1 -1
View File
@@ -335,7 +335,7 @@ namespace Barotrauma.Networking
if (gameStarted && Screen.Selected == GameMain.GameScreen) if (gameStarted && Screen.Selected == GameMain.GameScreen)
{ {
chatMsgBox.Visible = Character.Controlled == null || chatMsgBox.Visible = Character.Controlled == null ||
(!Character.Controlled.IsUnconscious && Character.Controlled.Stun >= 0.0f); (!Character.Controlled.IsUnconscious && Character.Controlled.Stun <= 0.0f);
inGameHUD.Update(deltaTime); inGameHUD.Update(deltaTime);