"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

View File

@@ -68,7 +68,7 @@ namespace Barotrauma
//listBox.Select(selection);
Character character = selection as Character;
if (character == null || character.IsDead) return false;
if (character == null || character.IsDead || character.IsUnconscious) return false;
if (characters.Contains(character))
{
@@ -242,7 +242,7 @@ namespace Barotrauma
protected virtual bool SelectCrewCharacter(GUIComponent component, object obj)
{
Character character = obj as Character;
if (character == null) return false;
if (character == null || character.IsDead || character.IsUnconscious) return false;
var crewFrame = component.Parent;
while (crewFrame.Parent!=null)