"Suicide button" is also usable in single player, unconscious characters can't be selected in sp, fixed resizing textblocks with wrapped text

This commit is contained in:
Regalis
2016-04-23 17:26:56 +03:00
parent 99072592bc
commit 14ef736176
7 changed files with 32 additions and 23 deletions
+2 -2
View File
@@ -38,7 +38,7 @@ namespace Barotrauma
if (cprButton != null && cprButton.Visible) cprButton.Update(deltaTime);
if (GameMain.NetworkMember != null && suicideButton != null && suicideButton.Visible) suicideButton.Update(deltaTime);
if (suicideButton != null && suicideButton.Visible) suicideButton.Update(deltaTime);
if (damageOverlayTimer > 0.0f) damageOverlayTimer -= deltaTime;
}
@@ -174,7 +174,7 @@ namespace Barotrauma
new Vector2(GameMain.GraphicsWidth / damageOverlay.size.X, GameMain.GraphicsHeight / damageOverlay.size.Y));
}
if (character.IsUnconscious && GameMain.NetworkMember!=null)
if (character.IsUnconscious)
{
if (suicideButton == null)
{