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

movercontroller namespace (#31749)

Browse Source
This commit is contained in:
Errant
2024-09-12 22:01:36 +02:00
committed by GitHub
parent 4b8510894f
commit 1c6b9aaae7
3 changed files with 1015 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Physics/Controllers/MoverController.cs
View File

@@ -8,10 +8,10 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Timing; using Robust.Shared.Timing;
namespace Content.Client.Physics.Controllers namespace Content.Client.Physics.Controllers;
public sealed class MoverController : SharedMoverController
{ {
public sealed class MoverController : SharedMoverController
{
[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -135,5 +135,4 @@ namespace Content.Client.Physics.Controllers
{ {
return _timing is { IsFirstTimePredicted: true, InSimulation: true }; return _timing is { IsFirstTimePredicted: true, InSimulation: true };
} }
}
} }

7
Content.Server/Physics/Controllers/MoverController.cs
View File

@@ -12,10 +12,10 @@ using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute; using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
namespace Content.Server.Physics.Controllers namespace Content.Server.Physics.Controllers;
public sealed class MoverController : SharedMoverController
{ {
public sealed class MoverController : SharedMoverController
{
[Dependency] private readonly ThrusterSystem _thruster = default!; [Dependency] private readonly ThrusterSystem _thruster = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!; [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
@@ -567,5 +567,4 @@ namespace Content.Server.Physics.Controllers
|| HasComp<PreventPilotComponent>(shuttleUid); || HasComp<PreventPilotComponent>(shuttleUid);
} }
}
} }

15
Content.Shared/Movement/Systems/SharedMoverController.cs
View File

@@ -24,14 +24,14 @@ using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent; using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
namespace Content.Shared.Movement.Systems namespace Content.Shared.Movement.Systems;
/// <summary>
/// Handles player and NPC mob movement.
/// NPCs are handled server-side only.
/// </summary>
public abstract partial class SharedMoverController : VirtualController
{ {
/// <summary>
/// Handles player and NPC mob movement.
/// NPCs are handled server-side only.
/// </summary>
public abstract partial class SharedMoverController : VirtualController
{
[Dependency] private readonly IConfigurationManager _configManager = default!; [Dependency] private readonly IConfigurationManager _configManager = default!;
[Dependency] protected readonly IGameTiming Timing = default!; [Dependency] protected readonly IGameTiming Timing = default!;
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
@@ -511,5 +511,4 @@ namespace Content.Shared.Movement.Systems
sound = haveShoes ? tileDef.FootstepSounds : tileDef.BarestepSounds; sound = haveShoes ? tileDef.FootstepSounds : tileDef.BarestepSounds;
return sound != null; return sound != null;
} }
}
} }