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

CBT2.0.3 #33

Browse Source
This commit is contained in:
Eero
2026-01-04 00:21:52 +08:00
parent 7c61859840
commit f4a0d149ca
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs
+36 -15
View File
@@ -892,6 +892,8 @@ namespace Barotrauma
return null; return null;
} }
if (GameMain.World == null) return null;
float closestFraction = 1.0f; float closestFraction = 1.0f;
Vector2 closestNormal = Vector2.Zero; Vector2 closestNormal = Vector2.Zero;
Fixture closestFixture = null; Fixture closestFixture = null;
@@ -899,19 +901,28 @@ namespace Barotrauma
if (allowInsideFixture) if (allowInsideFixture)
{ {
var aabb = new FarseerPhysics.Collision.AABB(rayStart - Vector2.One * 0.001f, rayStart + Vector2.One * 0.001f); var aabb = new FarseerPhysics.Collision.AABB(rayStart - Vector2.One * 0.001f, rayStart + Vector2.One * 0.001f);
GameMain.World.QueryAABB((fixture) => try
{ {
if (!CheckFixtureCollision(fixture, ignoredBodies, collisionCategory, ignoreSensors, customPredicate)) { return true; } GameMain.World.QueryAABB((fixture) =>
{
if (fixture == null || fixture.Body == null) { return true; }
fixture.Body.GetTransform(out FarseerPhysics.Common.Transform transform); if (!CheckFixtureCollision(fixture, ignoredBodies, collisionCategory, ignoreSensors, customPredicate)) { return true; }
if (!fixture.Shape.TestPoint(ref transform, ref rayStart)) { return true; }
closestFraction = 0.0f; fixture.Body.GetTransform(out FarseerPhysics.Common.Transform transform);
closestNormal = Vector2.Normalize(rayEnd - rayStart); if (!fixture.Shape.TestPoint(ref transform, ref rayStart)) { return true; }
closestFixture = fixture;
if (fixture.Body != null) { closestBody = fixture.Body; } closestFraction = 0.0f;
return false; closestNormal = Vector2.Normalize(rayEnd - rayStart);
}, ref aabb); closestFixture = fixture;
if (fixture.Body != null) { closestBody = fixture.Body; }
return false;
}, ref aabb);
}
catch (NullReferenceException)
{
return null;
}
if (closestFraction <= 0.0f) if (closestFraction <= 0.0f)
{ {
lastPickedPositionLocal.Value = rayStart; lastPickedPositionLocal.Value = rayStart;
@@ -2293,6 +2304,7 @@ namespace Barotrauma
/// </summary> /// </summary>
public void DisableObstructedWayPoints() public void DisableObstructedWayPoints()
{ {
// Check collisions to level // Check collisions to level
foreach (var node in OutdoorNodes) foreach (var node in OutdoorNodes)
{ {
@@ -2321,7 +2333,9 @@ namespace Barotrauma
/// </summary> /// </summary>
public void DisableObstructedWayPoints(Submarine otherSub) public void DisableObstructedWayPoints(Submarine otherSub)
{ {
if (otherSub == null) { return; }
if (otherSub?.PhysicsBody?.FarseerBody == null) return;
if (otherSub == this) { return; } if (otherSub == this) { return; }
// Check collisions to other subs. // Check collisions to other subs.
foreach (var node in OutdoorNodes) foreach (var node in OutdoorNodes)
@@ -2338,14 +2352,21 @@ namespace Barotrauma
{ {
Vector2 start = ConvertUnits.ToSimUnits(wp.WorldPosition) - otherSub.SimPosition; Vector2 start = ConvertUnits.ToSimUnits(wp.WorldPosition) - otherSub.SimPosition;
Vector2 end = ConvertUnits.ToSimUnits(connectedWp.WorldPosition) - otherSub.SimPosition; Vector2 end = ConvertUnits.ToSimUnits(connectedWp.WorldPosition) - otherSub.SimPosition;
var body = PickBody(start, end, null, Physics.CollisionWall, allowInsideFixture: true); try
if (body != null)
{ {
if (body.UserData is Structure wall && !wall.IsPlatform || body.UserData is Item && body.FixtureList[0].CollisionCategories.HasFlag(Physics.CollisionWall)) var body = PickBody(start, end, null, Physics.CollisionWall, allowInsideFixture: true);
if (body != null)
{ {
isObstructed = true; if (body.UserData is Structure wall && !wall.IsPlatform || body.UserData is Item && body.FixtureList?[0].CollisionCategories.HasFlag(Physics.CollisionWall) == true)
{
isObstructed = true;
}
} }
} }
catch (NullReferenceException)
{
continue;
}
} }
if (isObstructed) if (isObstructed)
{ {