summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-05 12:08:28 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:57 +0300
commit57978a09e9d32a44a95823716d790065d73f977a (patch)
tree0d89ebeebb91b86fd2c16fa9066b5a08fd7e4f73 /src/gui/windows
parent3b1d570f626786d141d99a7923669e82e0c125ca (diff)
downloadmanaplus-57978a09e9d32a44a95823716d790065d73f977a.tar.gz
manaplus-57978a09e9d32a44a95823716d790065d73f977a.tar.bz2
manaplus-57978a09e9d32a44a95823716d790065d73f977a.tar.xz
manaplus-57978a09e9d32a44a95823716d790065d73f977a.zip
Add skill type reading from server
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/skilldialog.cpp11
-rw-r--r--src/gui/windows/skilldialog.h8
2 files changed, 14 insertions, 5 deletions
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;