Lighting bugfixes, setting camera position to character on shift start

2015-12-26 22:35:28 +02:00
parent 064e2eadd0
commit 8c032d8368
10 changed files with 49 additions and 26 deletions
--- a/Subsurface/Source/Screens/GameScreen.cs
+++ b/Subsurface/Source/Screens/GameScreen.cs
@@ -39,7 +39,15 @@ namespace Barotrauma
        {
            base.Select();

-            if (Submarine.Loaded != null) cam.TargetPos = Submarine.Loaded.Position;
+            if (Character.Controlled!=null)
+            {
+                cam.Position = Character.Controlled.WorldPosition;
+            }
+            else if (Submarine.Loaded != null)
+            {
+                cam.Position = Submarine.Loaded.Position;
+            }
+

            foreach (MapEntity entity in MapEntity.mapEntityList)
                entity.IsHighlighted = false;