vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed fish being selectable

Browse Source 
Closes #91
This commit is contained in:
juanjp600
2017-12-07 00:01:48 -03:00
parent a272d22de8
commit 26216a0d99
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs
+7 -2
View File
@@ -205,10 +205,15 @@ namespace Barotrauma
Vector2 startPos = character.DrawPosition + (character.FocusedCharacter.DrawPosition - character.DrawPosition) * 0.7f; Vector2 startPos = character.DrawPosition + (character.FocusedCharacter.DrawPosition - character.DrawPosition) * 0.7f;
startPos = cam.WorldToScreen(startPos); startPos = cam.WorldToScreen(startPos);
string focusName = character.FocusedCharacter.SpeciesName;
if (character.FocusedCharacter.Info != null)
{
focusName = character.FocusedCharacter.Info.Name;
}
Vector2 textPos = startPos; 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) else if (character.SelectedCharacter == null && character.FocusedItem != null && character.SelectedConstruction == null)
{ {
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+1 -1
View File
@@ -1031,7 +1031,7 @@ namespace Barotrauma
public bool CanInteractWith(Character c, float maxDist = 200.0f) 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); maxDist = ConvertUnits.ToSimUnits(maxDist);
if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) return false; if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) return false;