From 0fa3de24e2e6931a07cbc1fb3dadfff9091250cf Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Dec 2012 18:50:20 +0300
Subject: Separate in skills skill info and skill data for future usage.

---
 src/gui/skilldialog.h | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'src/gui/skilldialog.h')

diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 945ae318d..45a5a8a43 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -40,41 +40,49 @@ class SkillModel;
 class Tab;
 class TabbedArea;
 
-struct SkillInfo final
+struct SkillData final
 {
-    unsigned short id;
     std::string name;
     std::string shortName;
     std::string dispName;
     Image *icon;
-    bool modifiable;
-    bool visible;
-    SkillModel *model;
 
+
+    std::string particle;
+    std::string soundHit;
+    std::string soundMiss;
+
+    SkillData();
+    A_DELETE_COPY(SkillData)
+    ~SkillData();
+};
+
+struct SkillInfo final
+{
     int level;
     std::string skillLevel;
     int skillLevelWidth;
-
+    unsigned short id;
+    bool modifiable;
+    bool visible;
+    SkillModel *model;
     std::string skillExp;
     float progress;
-    gcn::Color color;
     int range;
-    std::string particle;
-    std::string soundHit;
-    std::string soundMiss;
+    gcn::Color color;
 
-    SkillInfo();
+    SkillData data;
 
+    SkillInfo();
     A_DELETE_COPY(SkillInfo)
-
     ~SkillInfo();
 
-    void setIcon(const std::string &iconPath);
-
     void update();
 
     void draw(Graphics *const graphics, const int padding,
               const int paddingText, const int y, const int width);
+
+    void setIcon(const std::string &iconPath);
 };
 
 typedef std::vector<SkillInfo*> SkillList;
-- 
cgit v1.2.3-60-g2f50