diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-05 12:20:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-06 01:18:57 +0300 |
commit | 2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4 (patch) | |
tree | 2c0feb59deb99dbd45338ed813177c6826b543fb /src/gui | |
parent | 57978a09e9d32a44a95823716d790065d73f977a (diff) | |
download | manaplus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.tar.gz manaplus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.tar.bz2 manaplus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.tar.xz manaplus-2cdf1b18d5593dfecacfc7b2e113c404dc64d1f4.zip |
Use skill type struct in skill info.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/widgets/skillinfo.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/skillinfo.h | 4 | ||||
-rw-r--r-- | src/gui/windows/skilldialog.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/skilldialog.h | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp index 93b9bcf60..bd889865d 100644 --- a/src/gui/widgets/skillinfo.cpp +++ b/src/gui/widgets/skillinfo.cpp @@ -48,7 +48,7 @@ SkillInfo::SkillInfo() : skillLevelWidth(0), id(0), range(0), - type(0), + type(SkillType::Unknown), modifiable(false), visible(false) { diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index f096da9ac..10d6191df 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -25,6 +25,8 @@ #include "gui/color.h" +#include "resources/skilltype.h" + #include <vector> #include <map> #include <string> @@ -53,7 +55,7 @@ struct SkillInfo final int skillLevelWidth; unsigned int id; int range; - int type; + SkillType::SkillType type; bool modifiable; bool visible; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 73a023005..7be86ec1b 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -345,7 +345,7 @@ void SkillDialog::loadXmlFile(const std::string &fileName) bool SkillDialog::updateSkill(const int id, const int range, const bool modifiable, - const int type) + const SkillType::SkillType type) { const SkillMap::const_iterator it = mSkills.find(id); @@ -369,7 +369,7 @@ void SkillDialog::addSkill(const int id, const int level, const int range, const bool modifiable, - const int type) + const SkillType::SkillType type) { if (mDefaultModel) { diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 39082c1e7..8e2c325a0 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -27,6 +27,8 @@ #include "listeners/actionlistener.h" +#include "resources/skilltype.h" + class Button; class Label; class SkillModel; @@ -76,14 +78,14 @@ class SkillDialog final : public Window, bool updateSkill(const int id, const int range, const bool modifiable, - const int type); + const SkillType::SkillType type); void addSkill(const int id, const std::string &name, const int level, const int range, const bool modifiable, - const int type); + const SkillType::SkillType type); SkillInfo* getSkill(const int id) const A_WARN_UNUSED; |