NPC chat bubbles no longer persist between maps or when NPC is out of…

… view.
ethanmoffat · Sep 8, 2022 · 03d5ac7 · 03d5ac7
1 parent 0b7730d
commit 03d5ac7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/EndlessClient/Rendering/Chat/ChatBubble.cs b/EndlessClient/Rendering/Chat/ChatBubble.cs
@@ -163,6 +163,9 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
+                if (Game.Components != null && Game.Components.Contains(this))
+                    Game.Components.Remove(this);
+
                 _textLabel.Dispose();
             }
         }

diff --git a/EndlessClient/Rendering/Map/MapRenderer.cs b/EndlessClient/Rendering/Map/MapRenderer.cs
@@ -176,8 +176,7 @@ public void RenderEffect(byte x, byte y, short effectId)
         public void ClearTransientRenderables()
         {
             _mapGridEffectTargets.Clear();
-            // todo: clear NPC speech bubbles
-            // todo: hide map item/character/npc name
+            _mouseCursorRenderer.ClearTransientRenderables();
         }
 
         private void UpdateQuakeState()

diff --git a/EndlessClient/Rendering/MouseCursorRenderer.cs b/EndlessClient/Rendering/MouseCursorRenderer.cs
@@ -346,6 +346,12 @@ public void AnimateClick()
             _clickCoordinate = Option.Some(new MapCoordinate(_gridX, _gridY));
         }
 
+        public void ClearTransientRenderables()
+        {
+            _mapItemText.Visible = false;
+            _startClickTime = Option.None<DateTime>();
+        }
+
         protected override void Dispose(bool disposing)
         {
             if (disposing)
@@ -363,5 +369,7 @@ public interface IMouseCursorRenderer : IXNAControl, IDisposable
         void Draw(SpriteBatch spriteBatch, Vector2 additionalOffset);
 
         void AnimateClick();
+
+        void ClearTransientRenderables();
     }
 }
diff --git a/EndlessClient/Rendering/NPC/NPCRenderer.cs b/EndlessClient/Rendering/NPC/NPCRenderer.cs
@@ -336,6 +336,7 @@ protected override void Dispose(bool disposing)
             if (disposing)
             {
                 _nameLabel.Dispose();
+                _chatBubble?.Dispose();
             }
 
             base.Dispose(disposing);