diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/skillinfo.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/skillinfo.h | 1 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.cpp | 11 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.h | 8 |
4 files changed, 16 insertions, 5 deletions
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp index 683854ce8..93b9bcf60 100644 --- a/src/gui/widgets/skillinfo.cpp +++ b/src/gui/widgets/skillinfo.cpp @@ -48,6 +48,7 @@ SkillInfo::SkillInfo() : skillLevelWidth(0), id(0), range(0), + type(0), modifiable(false), visible(false) { diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index 7570feca5..f096da9ac 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -53,6 +53,7 @@ struct SkillInfo final int skillLevelWidth; unsigned int id; int range; + int type; bool modifiable; bool visible; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 63451d1a1..73a023005 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -342,8 +342,10 @@ void SkillDialog::loadXmlFile(const std::string &fileName) } } -bool SkillDialog::updateSkill(const int id, const int range, - const bool modifiable) +bool SkillDialog::updateSkill(const int id, + const int range, + const bool modifiable, + const int type) { const SkillMap::const_iterator it = mSkills.find(id); @@ -354,6 +356,7 @@ bool SkillDialog::updateSkill(const int id, const int range, { info->modifiable = modifiable; info->range = range; + info->type = type; info->update(); } return true; @@ -365,12 +368,14 @@ void SkillDialog::addSkill(const int id, const std::string &name, const int level, const int range, - const bool modifiable) + const bool modifiable, + const int type) { if (mDefaultModel) { SkillInfo *const skill = new SkillInfo; skill->id = static_cast<unsigned int>(id); + skill->type = type; SkillData *const data = skill->data; if (name.empty()) { diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index e82faef05..39082c1e7 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -73,13 +73,17 @@ class SkillDialog final : public Window, void loadSkills(); - bool updateSkill(const int id, const int range, const bool modifiable); + bool updateSkill(const int id, + const int range, + const bool modifiable, + const int type); void addSkill(const int id, const std::string &name, const int level, const int range, - const bool modifiable); + const bool modifiable, + const int type); SkillInfo* getSkill(const int id) const A_WARN_UNUSED; |