Fix some build warnings (#6832)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
using Content.Shared.Body.Events;
|
||||
using Content.Shared.DragDrop;
|
||||
using Content.Shared.Emoting;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Interaction.Events;
|
||||
using Content.Shared.Inventory.Events;
|
||||
using Content.Shared.Item;
|
||||
|
||||
@@ -33,7 +33,7 @@ public sealed class CameraRecoilSystem : EntitySystem
|
||||
|
||||
private readonly ISawmill _log;
|
||||
|
||||
protected CameraRecoilSystem(IEntityManager entityManager)
|
||||
private CameraRecoilSystem(IEntityManager entityManager)
|
||||
: base(entityManager)
|
||||
{
|
||||
_log = Logger.GetSawmill($"ecs.systems.{nameof(CameraRecoilSystem)}");
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace Content.Shared.Friction
|
||||
Mover.UseMobMovement(body.Owner)) continue;
|
||||
|
||||
var surfaceFriction = GetTileFriction(body);
|
||||
var bodyModifier = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SharedTileFrictionModifier>(body.Owner)?.Modifier ?? 1.0f;
|
||||
var bodyModifier = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<TileFrictionModifierComponent>(body.Owner)?.Modifier ?? 1.0f;
|
||||
var friction = _frictionModifier * surfaceFriction * bodyModifier;
|
||||
|
||||
ReduceLinearVelocity(prediction, body, friction, frameTime);
|
||||
|
||||
@@ -9,8 +9,7 @@ using Robust.Shared.ViewVariables;
|
||||
namespace Content.Shared.Friction
|
||||
{
|
||||
[RegisterComponent]
|
||||
[ComponentProtoName("TileFrictionModifier")]
|
||||
public sealed class SharedTileFrictionModifier : Component
|
||||
public sealed class TileFrictionModifierComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// Multiply the tilefriction cvar by this to get the body's actual tilefriction.
|
||||
@@ -43,7 +42,7 @@ namespace Content.Shared.Friction
|
||||
}
|
||||
|
||||
[NetSerializable, Serializable]
|
||||
protected sealed class TileFrictionComponentState : ComponentState
|
||||
private sealed class TileFrictionComponentState : ComponentState
|
||||
{
|
||||
public float Modifier;
|
||||
|
||||
|
||||
@@ -13,20 +13,20 @@ namespace Content.Shared.Rotatable
|
||||
/// </summary>
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField("rotateWhileAnchored")]
|
||||
public bool RotateWhileAnchored { get; protected set; }
|
||||
public bool RotateWhileAnchored { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// If true, will rotate entity in players direction when pulled
|
||||
/// </summary>
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField("rotateWhilePulling")]
|
||||
public bool RotateWhilePulling { get; protected set; } = true;
|
||||
public bool RotateWhilePulling { get; private set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// The angular value to change when using the rotate verbs.
|
||||
/// </summary>
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField("increment")]
|
||||
public Angle Increment { get; protected set; } = Angle.FromDegrees(90);
|
||||
public Angle Increment { get; private set; } = Angle.FromDegrees(90);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@ namespace Content.Shared.Verbs
|
||||
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
||||
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
||||
[Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
|
||||
[Dependency] private readonly ExamineSystemShared _examineSystem = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user