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

Transform refactor. (#139)

Browse Source 
space-wizards/space-station-14#725
This commit is contained in:
Pieter-Jan Briers
2019-01-18 11:40:30 +01:00
committed by GitHub
parent e8e1c9dd1f
commit 415b7e96fd
30 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/GameObjects/Components/Construction/SharedConstructorComponent.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Shared.GameObjects.Components.Construction
/// <summary>
/// Position to start building.
/// </summary>
public readonly GridLocalCoordinates Location;
public readonly GridCoordinates Location;
/// <summary>
/// The construction prototype to start building.
@@ -38,7 +38,7 @@ namespace Content.Shared.GameObjects.Components.Construction
/// </summary>
public readonly int Ack;
public TryStartStructureConstructionMessage(GridLocalCoordinates loc, string prototypeName, Angle angle, int ack)
public TryStartStructureConstructionMessage(GridCoordinates loc, string prototypeName, Angle angle, int ack)
{
Directed = true;
Location = loc;

4
Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs
View File

@@ -33,10 +33,10 @@ namespace Content.Shared.GameObjects.Components.Weapons.Ranged
[Serializable, NetSerializable]
protected class FireMessage : ComponentMessage
{
public readonly GridLocalCoordinates Target;
public readonly GridCoordinates Target;
public readonly int Tick;
public FireMessage(GridLocalCoordinates target, int tick)
public FireMessage(GridCoordinates target, int tick)
{
Target = target;
Tick = tick;

2
Content.Shared/Interfaces/ISharedNotifyManager.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Shared.Interfaces
public interface ISharedNotifyManager
{
void PopupMessage(IEntity source, IEntity viewer, string message);
void PopupMessage(GridLocalCoordinates coordinates, IEntity viewer, string message);
void PopupMessage(GridCoordinates coordinates, IEntity viewer, string message);
}
public static class NotifyManagerExt

6
Content.Shared/SharedNotifyManager.cs
View File

@@ -14,10 +14,10 @@ namespace Content.Shared
{
// TODO: we might eventually want for this to pass the actual entity,
// so the notify could track the entity movement visually.
PopupMessage(source.Transform.LocalPosition, viewer, message);
PopupMessage(source.Transform.GridPosition, viewer, message);
}
public abstract void PopupMessage(GridLocalCoordinates coordinates, IEntity viewer, string message);
public abstract void PopupMessage(GridCoordinates coordinates, IEntity viewer, string message);
protected class MsgDoNotify : NetMessage
{
@@ -30,7 +30,7 @@ namespace Content.Shared
#endregion
public string Message { get; set; }
public GridLocalCoordinates Coordinates;
public GridCoordinates Coordinates;
public override void ReadFromBuffer(NetIncomingMessage buffer)
{