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

Faction Test 100.8.0.0

Browse Source
This commit is contained in:
Markus Isberg
2022-12-01 22:00:25 +02:00
parent 0057f5bfce
commit f7f1ebd979
66 changed files with 965 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundPlayer.cs
+2 -3
View File
@@ -742,8 +742,7 @@ namespace Barotrauma
if (Screen.Selected == null) { return "menu".ToIdentifier(); }
if ((Screen.Selected?.IsEditor ?? false)
|| (Screen.Selected == GameMain.NetLobbyScreen))
if (Screen.Selected is { IsEditor: true } || GameMain.GameSession?.GameMode is TestGameMode || Screen.Selected == GameMain.NetLobbyScreen)
{
return "editor".ToIdentifier();
}
@@ -853,7 +852,7 @@ namespace Barotrauma
{
return "levelend".ToIdentifier();
}
if (GameMain.GameSession.RoundDuration > 120.0 &&
if (GameMain.GameSession.RoundDuration < 120.0 &&
Level.Loaded?.Type == LevelData.LevelType.LocationConnection)
{
return "start".ToIdentifier();