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

Submarine.PickBody & CheckVisibility ignore sensors

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-09-03 13:07:20 +03:00
parent c1f5e3cbda
commit 1e41abadd1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Map/Submarine.cs
+4 -3
View File
@@ -520,10 +520,11 @@ namespace Barotrauma
Body closestBody = null; Body closestBody = null;
GameMain.World.RayCast((fixture, point, normal, fraction) => GameMain.World.RayCast((fixture, point, normal, fraction) =>
{ {
if (fixture == null || if (fixture == null ||
fixture.IsSensor ||
fixture.CollisionCategories == Category.None || fixture.CollisionCategories == Category.None ||
fixture.CollisionCategories == Physics.CollisionItem) return -1; fixture.CollisionCategories == Physics.CollisionItem) return -1;
if (collisionCategory != null && if (collisionCategory != null &&
!fixture.CollisionCategories.HasFlag((Category)collisionCategory) && !fixture.CollisionCategories.HasFlag((Category)collisionCategory) &&
!((Category)collisionCategory).HasFlag(fixture.CollisionCategories)) return -1; !((Category)collisionCategory).HasFlag(fixture.CollisionCategories)) return -1;
@@ -568,7 +569,7 @@ namespace Barotrauma
GameMain.World.RayCast((fixture, point, normal, fraction) => GameMain.World.RayCast((fixture, point, normal, fraction) =>
{ {
if (fixture == null || if (fixture == null || fixture.IsSensor ||
(!fixture.CollisionCategories.HasFlag(Physics.CollisionWall) && !fixture.CollisionCategories.HasFlag(Physics.CollisionLevel))) return -1; (!fixture.CollisionCategories.HasFlag(Physics.CollisionWall) && !fixture.CollisionCategories.HasFlag(Physics.CollisionLevel))) return -1;
if (ignoreLevel && fixture.CollisionCategories == Physics.CollisionLevel) return -1; if (ignoreLevel && fixture.CollisionCategories == Physics.CollisionLevel) return -1;