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

Remove SharedEye (but content) (#19481)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 16:15:23 +10:00
committed by GitHub
parent c477e5b0c2
commit 28bf3a6240
29 changed files with 86 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
View File

@@ -21,6 +21,8 @@ public abstract class SharedContentEyeSystem : EntitySystem
public static readonly Vector2 DefaultZoom = Vector2.One;
public static readonly Vector2 MinZoom = DefaultZoom * (float)Math.Pow(ZoomMod, -3);
[Dependency] private readonly SharedEyeSystem _eye = default!;
public override void Initialize()
{
base.Initialize();
@@ -82,7 +84,7 @@ public abstract class SharedContentEyeSystem : EntitySystem
private void OnContentZoomRequest(RequestTargetZoomEvent msg, EntitySessionEventArgs args)
{
var ignoreLimit = msg.IgnoreLimit && _admin.HasAdminFlag(args.SenderSession, AdminFlags.Debug);
if (TryComp<ContentEyeComponent>(args.SenderSession.AttachedEntity, out var content))
SetZoom(args.SenderSession.AttachedEntity.Value, msg.TargetZoom, ignoreLimit, eye: content);
}
@@ -95,16 +97,15 @@ public abstract class SharedContentEyeSystem : EntitySystem
if (!HasComp<GhostComponent>(player) && !_admin.IsAdmin(player))
return;
if (TryComp<SharedEyeComponent>(player, out var eyeComp))
if (TryComp<EyeComponent>(player, out var eyeComp))
{
eyeComp.DrawFov = msg.Fov;
Dirty(player, eyeComp);
_eye.SetDrawFov(player, msg.Fov, eyeComp);
}
}
private void OnContentEyeStartup(EntityUid uid, ContentEyeComponent component, ComponentStartup args)
{
if (!TryComp<SharedEyeComponent>(uid, out var eyeComp))
if (!TryComp<EyeComponent>(uid, out var eyeComp))
return;
component.TargetZoom = eyeComp.Zoom;