From 2131a42c62c35c3b1876da1ac8dda967b93768e7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 6 Sep 2014 15:48:47 +0300
Subject: Show mana in skill popup.

---
 src/gui/widgets/skillinfo.cpp  |  6 ++++++
 src/gui/widgets/skillinfo.h    |  1 +
 src/gui/widgets/skilllistbox.h | 13 +++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 29b9510ee..721c4c98e 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -38,6 +38,7 @@
 SkillInfo::SkillInfo() :
     skillLevel(),
     skillExp(),
+    skillMana(),
     useButton(),
     progress(0.0F),
     color(),
@@ -93,6 +94,11 @@ void SkillInfo::update()
         skillLevel = strprintf(_("Lvl: %d"), baseLevel);
     }
 
+    if (sp)
+        skillMana = strprintf(_("Mana: -%d"), sp);
+    else
+        skillMana.clear();
+
     level = baseLevel;
     skillLevelWidth = -1;
 
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index bdeac330d..06c5a8670 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -45,6 +45,7 @@ struct SkillInfo final
 {
     std::string skillLevel;
     std::string skillExp;
+    std::string skillMana;
     std::string useButton;
     float progress;
     Color color;
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index a3b6be059..97be121a8 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -165,11 +165,20 @@ class SkillListBox final : public ListBox
                 return;
 
             const SkillInfo *const skill = getSkillByEvent(event);
-            if (!skill)
+            if (!skill || !skill->data)
                 return;
 
+            std::string description = skill->data->description;
+            std::string mana = skill->skillMana;
+            if (description.empty())
+            {
+                description = mana;
+                mana.clear();
+            }
             mPopup->show(viewport->mMouseX, viewport->mMouseY,
-                skill->data->dispName, skill->data->description);
+                skill->data->dispName,
+                description,
+                mana);
         }
 
         void mouseDragged(MouseEvent &event)
-- 
cgit v1.2.3-60-g2f50