- AI equips a diving suit before going out

- placing a firesource outside any hull won't crash the game
- scrollbars aren't gray
- fixed client crashing if in the lobby when a round ends
- fixed password box crashing
This commit is contained in:
Regalis
2016-01-25 18:47:19 +02:00
parent 89405d786b
commit 08daab9d87
12 changed files with 177 additions and 48 deletions

View File

@@ -595,12 +595,12 @@ namespace Barotrauma.Networking
public IEnumerable<object> EndGame(string endMessage)
{
GameMain.GameSession.gameMode.End(endMessage);
if (!gameStarted) yield return CoroutineStatus.Success;
GameMain.GameSession.gameMode.End(endMessage);
//var messageBox = new GUIMessageBox("The round has ended", endMessage, 400, 300);
if (!gameStarted) yield return CoroutineStatus.Success;
gameStarted = false;
Character.Controlled = null;