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

(0e668e083) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev (squashed together 20290af96..0e668e083 because the merge script shit itself due to the merges in between)

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-20 20:25:12 +03:00
parent d43b3737c8
commit 97b095bd10
32 changed files with 169 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+2 -2
View File
@@ -1527,7 +1527,7 @@ namespace Barotrauma
return true;
}
public bool CanInteractWith(Character c, float maxDist = 200.0f)
public bool CanInteractWith(Character c, float maxDist = 200.0f, bool checkVisibility = true)
{
if (c == this || Removed || !c.Enabled || !c.CanBeSelected) return false;
if (!c.CharacterHealth.UseHealthWindow && !c.CanBeDragged && c.onCustomInteract == null) return false;
@@ -1535,7 +1535,7 @@ namespace Barotrauma
maxDist = ConvertUnits.ToSimUnits(maxDist);
if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) return false;
return true;
return checkVisibility ? CanSeeCharacter(c) : true;
}
public bool CanInteractWith(Item item)