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

Misc audio and related changes for replays (#12578)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-22 13:49:48 +13:00
committed by GitHub
parent d6be5d2df3
commit 6917b0fe17
30 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Audio/BackgroundAudioSystem.cs
View File

@@ -199,7 +199,7 @@ public sealed class BackgroundAudioSystem : EntitySystem
return;
_playingCollection = _currentCollection;
var file = _robustRandom.Pick(_currentCollection.PickFiles).ToString();
_ambientStream = _audio.PlayGlobal(file, Filter.Local(),
_ambientStream = _audio.PlayGlobal(file, Filter.Local(), false,
_ambientParams.WithVolume(_ambientParams.Volume + _configManager.GetCVar(CCVars.AmbienceVolume)));
}
@@ -304,7 +304,7 @@ public sealed class BackgroundAudioSystem : EntitySystem
return;
}
_lobbyStream = _audio.PlayGlobal(file, Filter.Local(),
_lobbyStream = _audio.PlayGlobal(file, Filter.Local(), false,
_lobbyParams.WithVolume(_lobbyParams.Volume + _configManager.GetCVar(CCVars.LobbyMusicVolume)));
}

6
Content.Client/Audio/ClientGlobalSoundSystem.cs
View File

@@ -65,7 +65,7 @@ public sealed class ClientGlobalSoundSystem : SharedGlobalSoundSystem
{
if(!_adminAudioEnabled) return;
var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), soundEvent.AudioParams);
var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
_adminAudio.Add(stream);
}
@@ -74,13 +74,13 @@ public sealed class ClientGlobalSoundSystem : SharedGlobalSoundSystem
// Either the cvar is disabled or it's already playing
if(!_eventAudioEnabled || _eventAudio.ContainsKey(soundEvent.Type)) return;
var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), soundEvent.AudioParams);
var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
_eventAudio.Add(soundEvent.Type, stream);
}
private void PlayGameSound(GameGlobalSoundEvent soundEvent)
{
_audio.PlayGlobal(soundEvent.Filename, Filter.Local(), soundEvent.AudioParams);
_audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
}
private void StopStationEventMusic(StopStationEventMusic soundEvent)

2
Content.Client/Doors/DoorSystem.cs
View File

@@ -30,6 +30,6 @@ public sealed class DoorSystem : SharedDoorSystem
protected override void PlaySound(EntityUid uid, SoundSpecifier soundSpecifier, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted)
{
if (GameTiming.InPrediction && GameTiming.IsFirstTimePredicted)
Audio.Play(soundSpecifier, Filter.Local(), uid, audioParams);
Audio.Play(soundSpecifier, Filter.Local(), uid, false, audioParams);
}
}

2
Content.Client/Voting/VoteManager.cs
View File

@@ -119,7 +119,7 @@ namespace Content.Client.Voting
@new = true;
IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>()
.PlayGlobal("/Audio/Effects/voteding.ogg", Filter.Local());
.PlayGlobal("/Audio/Effects/voteding.ogg", Filter.Local(), false);
// New vote from the server.
var vote = new ActiveVote(voteId)

2
Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
View File

@@ -42,6 +42,6 @@ public sealed class FlyBySoundSystem : SharedFlyBySoundSystem
}
// Play attached to our entity because the projectile may immediately delete or the likes.
_audio.Play(component.Sound, Filter.Local(), attachedEnt.Value);
_audio.Play(component.Sound, Filter.Local(), attachedEnt.Value, false);
}
}