From 26216a0d994ee1fc1e70861b193b2b16014a7c68 Mon Sep 17 00:00:00 2001 From: juanjp600 Date: Thu, 7 Dec 2017 00:01:48 -0300 Subject: [PATCH] Fixed fish being selectable Closes #91 --- .../BarotraumaClient/Source/Characters/CharacterHUD.cs | 9 +++++++-- .../BarotraumaShared/Source/Characters/Character.cs | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs index a9f4d0dee..9a3ac7b23 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs @@ -205,10 +205,15 @@ namespace Barotrauma Vector2 startPos = character.DrawPosition + (character.FocusedCharacter.DrawPosition - character.DrawPosition) * 0.7f; startPos = cam.WorldToScreen(startPos); + string focusName = character.FocusedCharacter.SpeciesName; + if (character.FocusedCharacter.Info != null) + { + focusName = character.FocusedCharacter.Info.Name; + } Vector2 textPos = startPos; - textPos -= new Vector2(GUI.Font.MeasureString(character.FocusedCharacter.Info.Name).X / 2, 20); + textPos -= new Vector2(GUI.Font.MeasureString(focusName).X / 2, 20); - GUI.DrawString(spriteBatch, textPos, character.FocusedCharacter.Info.Name, Color.White, Color.Black, 2); + GUI.DrawString(spriteBatch, textPos, focusName, Color.White, Color.Black, 2); } else if (character.SelectedCharacter == null && character.FocusedItem != null && character.SelectedConstruction == null) { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs index c0f415aa9..954cfd211 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs @@ -1031,7 +1031,7 @@ namespace Barotrauma public bool CanInteractWith(Character c, float maxDist = 200.0f) { - if (c == this || !c.Enabled || !c.CanBeSelected) return false; + if (c == this || !c.Enabled || !c.IsHumanoid || !c.CanBeSelected) return false; maxDist = ConvertUnits.ToSimUnits(maxDist); if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) return false;