space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-06 17:58:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename GridCoordinates to FallbackCoordinates and move GetFallbackCoordinates to shared

Browse Source
This commit is contained in:
ShadowCommander
2021-08-28 02:29:47 -07:00
parent 5540d643ef
commit 2d6eebfae2
4 changed files with 56 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Server/GameObjects/EntitySystems/AudioSystem.cs
+5 -23
View File
@@ -11,9 +11,8 @@ using Robust.Shared.Players;
namespace Robust.Server.GameObjects
{
[UsedImplicitly]
public class AudioSystem : EntitySystem, IAudioSystem
public class AudioSystem : SharedAudioSystem, IAudioSystem
{
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
private const int AudioDistanceRange = 25;
@@ -97,13 +96,13 @@ namespace Robust.Server.GameObjects
var id = CacheIdentifier();
var gridCoordinates = GetGridCoordinates(entity.Transform.MapPosition);
var fallbackCoordinates = GetFallbackCoordinates(entity.Transform.MapPosition);
var msg = new PlayAudioEntityMessage
{
FileName = filename,
Coordinates = entity.Transform.Coordinates,
GridCoordinates = gridCoordinates,
FallbackCoordinates = fallbackCoordinates,
EntityUid = entity.Uid,
AudioParams = audioParams ?? AudioParams.Default,
Identifier = id,
@@ -126,13 +125,13 @@ namespace Robust.Server.GameObjects
var id = CacheIdentifier();
var gridCoordinates = GetGridCoordinates(coordinates.ToMap(_entityManager));
var fallbackCoordinates = GetFallbackCoordinates(coordinates.ToMap(_entityManager));
var msg = new PlayAudioPositionalMessage
{
FileName = filename,
Coordinates = coordinates,
GridCoordinates = gridCoordinates,
FallbackCoordinates = fallbackCoordinates,
AudioParams = audioParams ?? AudioParams.Default,
Identifier = id
};
@@ -145,22 +144,5 @@ namespace Robust.Server.GameObjects
return new AudioSourceServer(this, id, playerFilter.Recipients.ToArray());
}
private EntityCoordinates GetGridCoordinates(MapCoordinates mapCoordinates)
{
if (_mapManager.TryFindGridAt(mapCoordinates, out var mapGrid))
{
return new EntityCoordinates(mapGrid.GridEntityId,
mapGrid.WorldToLocal(mapCoordinates.Position));
}
if (_mapManager.HasMapEntity(mapCoordinates.MapId))
{
return new EntityCoordinates(_mapManager.GetMapEntityId(mapCoordinates.MapId),
mapCoordinates.Position);
}
return EntityCoordinates.Invalid;
}
}
}