Merge branch 'dev'

ClassicUO · Feb 2, 2020 · 4f27d13 · 4f27d13
2 parents dabebbf + 236404c
commit 4f27d13
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Game/UI/Gumps/SystemChatControl.cs b/src/Game/UI/Gumps/SystemChatControl.cs
@@ -233,6 +233,7 @@ private void ChatOnMessageReceived(object sender, UOMessageEventArgs e)
             {
                 case MessageType.Regular when e.Parent == null || ! SerialHelper.IsValid(e.Parent.Serial):
                 case MessageType.System:
+                case MessageType.Label:
                     AddLine(e.Text, e.Font, e.Hue, e.IsUnicode);
 
                     break;

diff --git a/src/Game/UI/Gumps/UseAbilityButtonGump.cs b/src/Game/UI/Gumps/UseAbilityButtonGump.cs
@@ -65,7 +65,7 @@ private void BuildGump()
             };
             Add(_button);
 
-            SetTooltip(ClilocLoader.Instance.GetString(1028838 + (byte) (((byte) (_isPrimary ? World.Player.PrimaryAbility : World.Player.SecondaryAbility) & 0x7F) - 1)), 80);
+            SetTooltip();
 
             WantUpdateSize = true;
             AcceptMouseInput = true;
@@ -74,6 +74,11 @@ private void BuildGump()
             GroupMatrixHeight = 44;
         }
 
+        private void SetTooltip()
+        {
+            SetTooltip(ClilocLoader.Instance.GetString(1028838 + (byte) (((byte) (_isPrimary ? World.Player.PrimaryAbility : World.Player.SecondaryAbility) & 0x7F) - 1)), 80);
+        }
+
         protected override bool OnMouseDoubleClick(int x, int y, MouseButtonType button)
         {
             if (button == MouseButtonType.Left)
@@ -103,6 +108,8 @@ public override void Update(double totalMS, double frameMS)
             {
                 _definition = def;
                 _button.Graphic = def.Icon;
+
+                SetTooltip();
             }
         }