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

removed TryGetSound + made some SoundSpecifier datafields required

Browse Source
This commit is contained in:
Galactic Chimp
2021-07-31 19:52:33 +02:00
parent 8ff703c338
commit 57016d14b4
114 changed files with 519 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Physics/Controllers/MoverController.cs
View File

@@ -214,10 +214,9 @@ namespace Content.Server.Physics.Controllers
string? soundToPlay = null;
foreach (var maybeFootstep in grid.GetAnchoredEntities(tile.GridIndices))
{
if (EntityManager.ComponentManager.TryGetComponent(maybeFootstep, out FootstepModifierComponent? footstep) &&
footstep._soundCollection.TryGetSound(out var footstepSound))
if (EntityManager.ComponentManager.TryGetComponent(maybeFootstep, out FootstepModifierComponent? footstep))
{
soundToPlay = footstepSound;
soundToPlay = footstep.SoundCollection.GetSound();
break;
}
}
@@ -226,11 +225,8 @@ namespace Content.Server.Physics.Controllers
{
// Walking on a tile.
var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];
if (def.FootstepSounds.TryGetSound(out var footstepSound))
{
soundToPlay = footstepSound;
return;
}
soundToPlay = def.FootstepSounds.GetSound();
return;
}
if (string.IsNullOrWhiteSpace(soundToPlay))