tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace obsolete functions in NPC systems (#31448)

Browse Source
This commit is contained in:
Mervill
2024-08-26 15:29:44 -07:00
committed by GitHub
parent f65f57ef92
commit e85c25a746
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
View File

@@ -22,7 +22,7 @@ public sealed partial class NPCSteeringSystem
if (weight == 0f || direction == Vector2.Zero)
return;
var directionAngle = (float) direction.ToAngle().Theta;
var directionAngle = (float)direction.ToAngle().Theta;
for (var i = 0; i < InterestDirections; i++)
{
@@ -166,8 +166,8 @@ public sealed partial class NPCSteeringSystem
}
// Check if mapids match.
var targetMap = targetCoordinates.ToMap(EntityManager, _transform);
var ourMap = ourCoordinates.ToMap(EntityManager, _transform);
var targetMap = _transform.ToMapCoordinates(targetCoordinates);
var ourMap = _transform.ToMapCoordinates(ourCoordinates);
if (targetMap.MapId != ourMap.MapId)
{
@@ -258,7 +258,7 @@ public sealed partial class NPCSteeringSystem
return false;
}
targetMap = targetCoordinates.ToMap(EntityManager, _transform);
targetMap = _transform.ToMapCoordinates(targetCoordinates);
// Can't make it again.
if (ourMap.MapId != targetMap.MapId)
@@ -429,7 +429,7 @@ public sealed partial class NPCSteeringSystem
if (TryComp<PhysicsComponent>(uid, out var physics))
{
mask = (CollisionGroup) physics.CollisionMask;
mask = (CollisionGroup)physics.CollisionMask;
}
for (var i = 0; i < nodes.Count; i++)
@@ -439,7 +439,7 @@ public sealed partial class NPCSteeringSystem
if (!node.Data.IsFreeSpace)
break;
var nodeMap = node.Coordinates.ToMap(EntityManager, _transform);
var nodeMap = _transform.ToMapCoordinates(node.Coordinates);
// If any nodes are 'behind us' relative to the target we'll prune them.
// This isn't perfect but should fix most cases of stutter stepping.