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

misc flare fixes (#12942)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-14 09:46:58 +13:00
committed by GitHub
parent 5a756a0094
commit f65510ca81
5 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
View File

@@ -2,10 +2,6 @@ using Content.Client.Light.Components;
using Content.Shared.Light.Component;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Player;
namespace Content.Client.Light.Visualizers
{
@@ -35,31 +31,21 @@ namespace Content.Client.Light.Visualizers
}
}
void TryStopStream(IPlayingAudioStream? stream)
{
stream?.Stop();
}
if (component.TryGetData(ExpendableLightVisuals.State, out ExpendableLightState state)
&& entities.TryGetComponent(component.Owner, out ExpendableLightComponent? expendableLight))
&& entities.TryGetComponent(component.Owner, out ExpendableLightComponent? expendableLight))
{
switch (state)
{
case ExpendableLightState.Lit:
{
TryStopStream(expendableLight.PlayingStream);
if (expendableLight.LoopedSound != null)
{
expendableLight.PlayingStream = SoundSystem.Play(expendableLight.LoopedSound, Filter.Local(),
expendableLight.Owner, SharedExpendableLightComponent.LoopedSoundParams.WithLoop(true));
}
expendableLight.PlayingStream?.Stop();
expendableLight.PlayingStream = entities.EntitySysManager.GetEntitySystem<SharedAudioSystem>().PlayPvs(
expendableLight.LoopedSound,
expendableLight.Owner,
SharedExpendableLightComponent.LoopedSoundParams);
break;
}
case ExpendableLightState.Dead:
{
TryStopStream(expendableLight.PlayingStream);
expendableLight.PlayingStream?.Stop();
break;
}
}
}
}