Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Reorders Sound Systems signatures to match Popup Systems. (#8728)

Browse Source
This commit is contained in:
keronshb
2022-06-12 19:45:47 -04:00
committed by GitHub
parent 78fb4b88ed
commit f7b1bda3e5
138 changed files with 257 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Tools/ToolSystem.MultipleTool.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Server.Tools
var current = multiple.Entries[multiple.CurrentEntry];
if(current.ChangeSound is {} changeSound)
SoundSystem.Play(Filter.Pvs(uid), changeSound.GetSound(), uid);
SoundSystem.Play(changeSound.GetSound(), Filter.Pvs(uid), uid);
return true;
}

6
Content.Server/Tools/ToolSystem.Welder.cs
View File

@@ -111,7 +111,7 @@ namespace Content.Server.Tools
if (light != null)
light.Enabled = true;
SoundSystem.Play(Filter.Pvs(uid), welder.WelderOnSounds.GetSound(), uid, AudioHelpers.WithVariation(0.125f).WithVolume(-5f));
SoundSystem.Play(welder.WelderOnSounds.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.125f).WithVolume(-5f));
// TODO: Use TransformComponent directly.
_atmosphereSystem.HotspotExpose(EntityManager.GetComponent<TransformComponent>(welder.Owner).Coordinates, 700, 50, true);
@@ -146,7 +146,7 @@ namespace Content.Server.Tools
if (light != null)
light.Enabled = false;
SoundSystem.Play(Filter.Pvs(uid), welder.WelderOffSounds.GetSound(), uid, AudioHelpers.WithVariation(0.125f).WithVolume(-5f));
SoundSystem.Play(welder.WelderOffSounds.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.125f).WithVolume(-5f));
welder.Dirty();
@@ -217,7 +217,7 @@ namespace Content.Server.Tools
{
var drained = _solutionContainerSystem.Drain(target, targetSolution, trans);
_solutionContainerSystem.TryAddSolution(uid, welderSolution, drained);
SoundSystem.Play(Filter.Pvs(uid), welder.WelderRefill.GetSound(), uid);
SoundSystem.Play(welder.WelderRefill.GetSound(), Filter.Pvs(uid), uid);
target.PopupMessage(args.User, Loc.GetString("welder-component-after-interact-refueled-message"));
}
else

4
Content.Server/Tools/ToolSystem.cs
View File

@@ -244,8 +244,8 @@ namespace Content.Server.Tools
return;
// Pass tool.Owner to Filter.Pvs to avoid a TryGetEntity call.
SoundSystem.Play(Filter.Pvs(tool.Owner), sound.GetSound(), uid,
AudioHelpers.WithVariation(0.175f).WithVolume(-5f));
SoundSystem.Play(sound.GetSound(), Filter.Pvs(tool.Owner),
uid, AudioHelpers.WithVariation(0.175f).WithVolume(-5f));
}
public override void Update(float frameTime)