Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

4
Content.Server/Storage/Components/CursedEntityStorageComponent.cs
View File

@@ -47,8 +47,8 @@ namespace Content.Server.Storage.Components
locker.Insert(entity);
}
SoundSystem.Play(Filter.Pvs(Owner), _cursedSound.GetSound(), Owner, AudioHelpers.WithVariation(0.125f));
SoundSystem.Play(Filter.Pvs(lockerEnt), _cursedLockerSound.GetSound(), lockerEnt, AudioHelpers.WithVariation(0.125f));
SoundSystem.Play(_cursedSound.GetSound(), Filter.Pvs(Owner), Owner, AudioHelpers.WithVariation(0.125f));
SoundSystem.Play(_cursedLockerSound.GetSound(), Filter.Pvs(lockerEnt), lockerEnt, AudioHelpers.WithVariation(0.125f));
}
}
}

4
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -200,7 +200,7 @@ namespace Content.Server.Storage.Components
}
ModifyComponents();
SoundSystem.Play(Filter.Pvs(Owner), _closeSound.GetSound(), Owner);
SoundSystem.Play(_closeSound.GetSound(), Filter.Pvs(Owner), Owner);
LastInternalOpenAttempt = default;
}
@@ -251,7 +251,7 @@ namespace Content.Server.Storage.Components
Open = true;
EntitySystem.Get<EntityStorageSystem>().EmptyContents(Owner, this);
ModifyComponents();
SoundSystem.Play(Filter.Pvs(Owner), _openSound.GetSound(), Owner);
SoundSystem.Play(_openSound.GetSound(), Filter.Pvs(Owner), Owner);
}
private void ModifyComponents()

2
Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Storage.EntitySystems
}
if (component.Sound != null)
SoundSystem.Play(Filter.Pvs(uid), component.Sound.GetSound(), uid);
SoundSystem.Play(component.Sound.GetSound(), Filter.Pvs(uid), uid);
component.Uses--;
if (component.Uses == 0)

12
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -290,7 +290,7 @@ namespace Content.Server.Storage.EntitySystems
if (successfullyInserted.Count > 0)
{
if (storageComp.StorageInsertSound is not null)
SoundSystem.Play(Filter.Pvs(uid, entityManager: EntityManager), storageComp.StorageInsertSound.GetSound(), uid, AudioParams.Default);
SoundSystem.Play(storageComp.StorageInsertSound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid, AudioParams.Default);
RaiseNetworkEvent(new AnimateInsertingEntitiesEvent(uid, successfullyInserted, successfullyInsertedPositions));
}
return;
@@ -360,10 +360,10 @@ namespace Content.Server.Storage.EntitySystems
// If the user's active hand is empty, try pick up the item.
if (hands.ActiveHandEntity == null)
{
{
if (_sharedHandsSystem.TryPickupAnyHand(player, args.InteractedItemUID, handsComp: hands)
&& storageComp.StorageRemoveSound != null)
SoundSystem.Play(Filter.Pvs(uid, entityManager: EntityManager), storageComp.StorageRemoveSound.GetSound(), uid, AudioParams.Default);
SoundSystem.Play(storageComp.StorageRemoveSound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid, AudioParams.Default);
return;
}
@@ -401,7 +401,7 @@ namespace Content.Server.Storage.EntitySystems
UpdateStorageVisualization(uid, storageComp);
if (storageComp.StorageCloseSound is not null)
SoundSystem.Play(Filter.Pvs(uid, entityManager: EntityManager), storageComp.StorageCloseSound.GetSound(), uid, storageComp.StorageCloseSound.Params);
SoundSystem.Play(storageComp.StorageCloseSound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid, storageComp.StorageCloseSound.Params);
}
}
@@ -513,7 +513,7 @@ namespace Content.Server.Storage.EntitySystems
return false;
if (storageComp.StorageInsertSound is not null)
SoundSystem.Play(Filter.Pvs(uid, entityManager: EntityManager), storageComp.StorageInsertSound.GetSound(), uid, AudioParams.Default);
SoundSystem.Play(storageComp.StorageInsertSound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid, AudioParams.Default);
RecalculateStorageUsed(storageComp);
UpdateStorageUI(uid, storageComp);
@@ -593,7 +593,7 @@ namespace Content.Server.Storage.EntitySystems
return;
if (storageComp.StorageOpenSound is not null)
SoundSystem.Play(Filter.Pvs(uid, entityManager: EntityManager), storageComp.StorageOpenSound.GetSound(), uid, storageComp.StorageOpenSound.Params);
SoundSystem.Play(storageComp.StorageOpenSound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid, storageComp.StorageOpenSound.Params);
Logger.DebugS(storageComp.LoggerName, $"Storage (UID {uid}) \"used\" by player session (UID {player.PlayerSession.AttachedEntity}).");