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

9
Content.Server/Projectiles/ProjectileSystem.cs
View File

@@ -32,14 +32,13 @@ namespace Content.Server.Projectiles
var coordinates = args.OtherFixture.Body.Owner.Transform.Coordinates;
var playerFilter = Filter.Pvs(coordinates);
if (!otherEntity.Deleted &&
otherEntity.HasComponent<SharedBodyComponent>() && component.SoundHitSpecies.TryGetSound(out var soundHitSpecies))
if (!otherEntity.Deleted && otherEntity.HasComponent<SharedBodyComponent>())
{
SoundSystem.Play(playerFilter, soundHitSpecies, coordinates);
SoundSystem.Play(playerFilter, component.SoundHitSpecies.GetSound(), coordinates);
}
else if (component.SoundHit.TryGetSound(out var soundHit))
else
{
SoundSystem.Play(playerFilter, soundHit, coordinates);
SoundSystem.Play(playerFilter, component.SoundHit.GetSound(), coordinates);
}
if (!otherEntity.Deleted && otherEntity.TryGetComponent(out IDamageableComponent? damage))