tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some build warnings (#6832)

Browse Source 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-02-21 14:41:50 +11:00
committed by GitHub
parent f9c853f100
commit b87806f7ed
36 changed files with 53 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Friction/SharedTileFrictionController.cs
View File

@@ -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);

5
Content.Shared/Friction/TileFrictionModifier.cs
View File

@@ -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;