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

Fix a few warnings (#11576)

Browse Source
This commit is contained in:
metalgearsloth
2022-10-04 14:24:19 +11:00
committed by GitHub
parent a6d20803a6
commit 600c0e3255
43 changed files with 185 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
View File

@@ -84,7 +84,7 @@ public partial class SharedGunSystem
component.AmmoSlots[index] = uid;
component.AmmoContainer.Insert(uid);
PlaySound(component.Owner, component.SoundInsert?.GetSound(Random, ProtoManager), user);
Audio.PlayPredicted(component.SoundInsert, component.Owner, user);
Popup(Loc.GetString("gun-revolver-insert"), component.Owner, user);
UpdateRevolverAppearance(component);
UpdateAmmoCount(uid);
@@ -210,7 +210,7 @@ public partial class SharedGunSystem
if (anyEmpty)
{
PlaySound(component.Owner, component.SoundEject?.GetSound(Random, ProtoManager), user);
Audio.PlayPredicted(component.SoundEject, component.Owner, user);
UpdateAmmoCount(component.Owner);
UpdateRevolverAppearance(component);
Dirty(component);
@@ -219,16 +219,18 @@ public partial class SharedGunSystem
private void UpdateRevolverAppearance(RevolverAmmoProviderComponent component)
{
if (!TryComp<AppearanceComponent>(component.Owner, out var appearance)) return;
if (!TryComp<AppearanceComponent>(component.Owner, out var appearance))
return;
var count = GetRevolverCount(component);
appearance.SetData(AmmoVisuals.HasAmmo, count != 0);
appearance.SetData(AmmoVisuals.AmmoCount, count);
appearance.SetData(AmmoVisuals.AmmoMax, component.Capacity);
Appearance.SetData(component.Owner, AmmoVisuals.HasAmmo, count != 0, appearance);
Appearance.SetData(component.Owner, AmmoVisuals.AmmoCount, count, appearance);
Appearance.SetData(component.Owner, AmmoVisuals.AmmoMax, component.Capacity, appearance);
}
protected virtual void SpinRevolver(RevolverAmmoProviderComponent component, EntityUid? user = null)
{
PlaySound(component.Owner, component.SoundSpin?.GetSound(Random, ProtoManager), user);
Audio.PlayPredicted(component.SoundSpin, component.Owner, user);
Popup(Loc.GetString("gun-revolver-spun"), component.Owner, user);
}