From 2a114000435323250706602385358b98818d9624 Mon Sep 17 00:00:00 2001 From: amylizzle Date: Mon, 11 Nov 2024 15:43:55 +0000 Subject: [PATCH] fix client image bugs --- OpenDreamClient/Rendering/DreamViewOverlay.cs | 5 +++-- OpenDreamShared/Dream/ImmutableIconAppearance.cs | 1 + OpenDreamShared/Dream/MutableIconAppearance.cs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenDreamClient/Rendering/DreamViewOverlay.cs b/OpenDreamClient/Rendering/DreamViewOverlay.cs index 863ae98ab3..290c3287ff 100644 --- a/OpenDreamClient/Rendering/DreamViewOverlay.cs +++ b/OpenDreamClient/Rendering/DreamViewOverlay.cs @@ -316,9 +316,10 @@ private void ProcessIconComponents(DreamIcon icon, Vector2 position, EntityUid u continue; if(sprite.Icon.Appearance == null) continue; - if(sprite.Icon.Appearance.Override) + if(sprite.Icon.Appearance.Override) { current.MainIcon = sprite.Icon; - else + current.Position = current.Position + (sprite.Icon.Appearance.TotalPixelOffset / (float)EyeManager.PixelsPerMeter); + } else ProcessIconComponents(sprite.Icon, current.Position, uid, isScreen, ref tieBreaker, result, current); } } diff --git a/OpenDreamShared/Dream/ImmutableIconAppearance.cs b/OpenDreamShared/Dream/ImmutableIconAppearance.cs index a685f3fd1a..b3dbade249 100644 --- a/OpenDreamShared/Dream/ImmutableIconAppearance.cs +++ b/OpenDreamShared/Dream/ImmutableIconAppearance.cs @@ -203,6 +203,7 @@ public override int GetHashCode() { hashCode.Add(Layer); hashCode.Add(Invisibility); hashCode.Add(Opacity); + hashCode.Add(Override); hashCode.Add(MouseOpacity); hashCode.Add(Alpha); hashCode.Add(GlideSize); diff --git a/OpenDreamShared/Dream/MutableIconAppearance.cs b/OpenDreamShared/Dream/MutableIconAppearance.cs index cf83026ad8..1b8f20ad50 100644 --- a/OpenDreamShared/Dream/MutableIconAppearance.cs +++ b/OpenDreamShared/Dream/MutableIconAppearance.cs @@ -219,6 +219,7 @@ public override int GetHashCode() { hashCode.Add(Layer); hashCode.Add(Invisibility); hashCode.Add(Opacity); + hashCode.Add(Override); hashCode.Add(MouseOpacity); hashCode.Add(Alpha); hashCode.Add(GlideSize);