v1.5.7.0 (Summer Update)

2024-06-18 16:49:51 +03:00
parent 4a63dacbce
commit 230d1b6e78
263 changed files with 7792 additions and 2845 deletions
@@ -558,14 +558,17 @@ namespace Barotrauma

                if (GameMain.Client != null) { chatMessage += " " + TextManager.Get("DeathChatNotification"); }

-                GameMain.NetworkMember.RespawnManager?.ShowRespawnPromptIfNeeded();
+                RespawnManager.ShowDeathPromptIfNeeded();

                GameMain.NetworkMember.AddChatMessage(chatMessage.Value, ChatMessageType.Dead);
                GameMain.LightManager.LosEnabled = false;
                controlled = null;
-                if (!(Screen.Selected?.Cam is null))
+                if (Screen.Selected?.Cam is Camera cam)
                {
-                    Screen.Selected.Cam.TargetPos = Vector2.Zero;
+                    cam.TargetPos = Vector2.Zero;
+                    //briefly lock moving the camera with arrow keys
+                    //(it's annoying to have the camera fly off when you die while trying to move to safety)
+                    cam.MovementLockTimer = 2.0f;                    
                    Lights.LightManager.ViewTarget = null;
                }
            }