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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jabak
2024-07-23 19:02:41 +03:00
parent 2204038ce6 003452b8e1
commit 624e6a9453
19 changed files with 16347 additions and 8230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/_White/Overlays/ThermalVisionOverlay.cs
View File

@@ -77,7 +77,7 @@ public sealed class ThermalVisionOverlay : Overlay
var entities = _entity.EntityQueryEnumerator<BodyComponent, SpriteComponent, TransformComponent>();
while (entities.MoveNext(out var uid, out _, out var sprite, out var xform))
{
if (!CanSee(uid))
if (!CanSee(uid, sprite))
continue;
var entity = uid;
@@ -114,7 +114,7 @@ public sealed class ThermalVisionOverlay : Overlay
Angle eyeRot)
{
var (uid, sprite, xform) = ent;
if (xform.MapID != map || HasOccluders(uid) || !CanSee(uid))
if (xform.MapID != map || HasOccluders(uid) || !CanSee(uid, sprite))
return;
var position = _transform.GetWorldPosition(xform);
@@ -123,9 +123,9 @@ public sealed class ThermalVisionOverlay : Overlay
sprite.Render(handle, eyeRot, rotation, position: position);
}
private bool CanSee(EntityUid ent)
private bool CanSee(EntityUid ent, SpriteComponent sprite)
{
return !_entity.HasComponent<ThermalBlockerComponent>(ent);
return sprite.Visible && !_entity.HasComponent<ThermalBlockerComponent>(ent);
}
private bool HasOccluders(EntityUid ent)