- fixed exception in GetSubsToLeaveBehind if the round ends when none of the subs is at an exit

- water surface is clamped above the bottom of the hull
- character names don't overlap with health bars

Subsurface/Source/Characters/Character.cs

@@ -1328,7 +1328,7 @@ namespace Barotrauma
 
             if (info != null)
             {
-                Vector2 namePos = new Vector2(pos.X, pos.Y - 80.0f - (5.0f/cam.Zoom)) - GUI.Font.MeasureString(Info.Name) * 0.5f / cam.Zoom;
+                Vector2 namePos = new Vector2(pos.X, pos.Y - 110.0f - (5.0f/cam.Zoom)) - GUI.Font.MeasureString(Info.Name) * 0.5f / cam.Zoom;
                 Color nameColor = Color.White;
                 
                 if (Character.Controlled != null && TeamID!=Character.Controlled.TeamID)

Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs

@@ -241,6 +241,10 @@ namespace Barotrauma
         {
             isRunning = false;
 
+            bool success = CrewManager.characters.Any(c => !c.IsDead);
+
+            if (success)
+            {
                 if (subsToLeaveBehind == null || leavingSub == null)
                 {
                     DebugConsole.ThrowError("Leaving submarine not selected -> selecting the closest one");
@@ -249,9 +253,7 @@ namespace Barotrauma
 
                     subsToLeaveBehind = GetSubsToLeaveBehind(leavingSub);
                 }
-
+            }
-
-            bool success = CrewManager.characters.Any(c => !c.IsDead);
             
             GameMain.GameSession.EndShift("");
 

Subsurface/Source/Map/Hull.cs

@@ -100,6 +100,8 @@ namespace Barotrauma
                     Item.UpdateHulls();
                     Gap.UpdateHulls();
                 }
+
+                surface = rect.Y - rect.Height + Volume / rect.Width;
             }
         }
 
@@ -506,7 +508,7 @@ namespace Barotrauma
             }
 
             //interpolate the position of the rendered surface towards the "target surface"
-            surface = MathHelper.Lerp(surface, surfaceY, deltaTime*10.0f);
+            surface = Math.Max(MathHelper.Lerp(surface, surfaceY, deltaTime*10.0f), rect.Y - rect.Height);
 
             if (volume < FullVolume)
             {