(221f9f2a6) Merge branch 'dev' into capitalizationfixes

2019-06-04 15:38:31 +03:00
parent f797235bfd
commit e592c49fa8
22 changed files with 97 additions and 72 deletions
@@ -159,8 +159,14 @@ namespace Barotrauma
        public void StartRound(Level level, bool reloadSub = true, bool loadSecondSub = false, bool mirrorLevel = false)
        {
 #if CLIENT
-            GameMain.LightManager.LosEnabled = GameMain.Client == null || GameMain.Client.CharacterInfo != null;
-            if (GameMain.Client == null) GameMain.LightManager.LosMode = GameMain.Config.LosMode;
+            if (GameMain.Client == null)
+            {
+                GameMain.LightManager.LosMode = GameMain.Config.LosMode;
+            }
+            else
+            {
+                GameMain.LightManager.LosEnabled = GameMain.Client.CharacterInfo != null;
+            }
 #endif
            this.Level = level;