Merge branch 'master' of https://bitbucket.org/Regalis11/barotrauma into multisub

Conflicts: Subsurface/Source/GUI/GUI.cs
2016-06-09 18:39:54 +03:00
parent 41569675f3 d520c00dc9
commit c9fd599276
28 changed files with 346 additions and 66 deletions
@@ -1030,6 +1030,12 @@ namespace Barotrauma
                    PressureTimer = 0.0f;
                }
            }
+
+            if (controlled == this)
+            {
+                Lights.LightManager.ViewTarget = this;
+                CharacterHUD.Update(deltaTime, this);
+            }
            
            if (IsUnconscious)
            {
@@ -1039,8 +1045,6 @@ namespace Barotrauma

            if (controlled == this)
            {
-                Lights.LightManager.ViewTarget = this;
-                CharacterHUD.Update(deltaTime,this);
                ControlLocalPlayer(deltaTime, cam);
            }