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

Changes resulting from merging Client and Server PhysicsComponent.

Browse Source
This commit is contained in:
Acruid
2020-07-01 12:03:19 -07:00
parent b807b9e7ee
commit f0561d8d95
14 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Physics/MoverController.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.Components.Movement;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
@@ -9,7 +10,7 @@ namespace Content.Shared.Physics
public class MoverController : VirtualController
{
private Vector2 _velocity;
private SharedPhysicsComponent _component = null;
private PhysicsComponent _component = null;
public Vector2 Velocity
{
@@ -17,7 +18,7 @@ namespace Content.Shared.Physics
set => _velocity = value;
}
public override SharedPhysicsComponent ControlledComponent
public override PhysicsComponent ControlledComponent
{
set => _component = value;
}