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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Popups/PopupSystem.cs
View File

@@ -4,7 +4,6 @@ using Content.Client.Stylesheets;
using Content.Shared.GameTicking;
using Content.Shared.Popups;
using Robust.Client.Graphics;
using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
@@ -52,7 +51,7 @@ namespace Content.Client.Popups
PopupMessage(message, _eyeManager.CoordinatesToScreen(transform.Coordinates));
}
public void PopupMessage(string message, ScreenCoordinates coordinates, IEntity? entity = null)
public void PopupMessage(string message, ScreenCoordinates coordinates, EntityUid entity = default)
{
var label = new PopupLabel(_eyeManager)
{
@@ -146,7 +145,7 @@ namespace Content.Client.Popups
public float TimeLeft { get; private set; }
public Vector2 InitialPos { get; set; }
public IEntity? Entity { get; set; }
public EntityUid Entity { get; set; }
public PopupLabel(IEyeManager eyeManager)
{
@@ -160,7 +159,7 @@ namespace Content.Client.Popups
{
TimeLeft += eventArgs.DeltaSeconds;
var position = Entity == null
var position = Entity == default
? InitialPos
: (_eyeManager.CoordinatesToScreen(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Entity).Coordinates).Position / UIScale) - DesiredSize / 2;