summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-28 23:47:53 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-28 23:47:53 +0300
commit9651fe916f2e0e91778fd18bfacbe401f99a2de6 (patch)
treefae1b7d830344fb084abed01f585ebf8fcaf7cd5 /src/gui
parent3eb71b6f5e3a60de5b597ba2f600f3bb57fccde6 (diff)
downloadmanaplus-9651fe916f2e0e91778fd18bfacbe401f99a2de6.tar.gz
manaplus-9651fe916f2e0e91778fd18bfacbe401f99a2de6.tar.bz2
manaplus-9651fe916f2e0e91778fd18bfacbe401f99a2de6.tar.xz
manaplus-9651fe916f2e0e91778fd18bfacbe401f99a2de6.zip
move bools in skillinfo.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/skillinfo.cpp16
-rw-r--r--src/gui/widgets/skillinfo.h17
2 files changed, 16 insertions, 17 deletions
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 2b7060c31..809e34b0d 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -29,19 +29,19 @@
#include "debug.h"
SkillInfo::SkillInfo() :
- level(0),
skillLevel(),
- skillLevelWidth(0),
- id(0),
- modifiable(false),
- visible(false),
- model(nullptr),
skillExp(),
progress(0.0f),
- range(0),
color(),
+ dataMap(),
+ model(nullptr),
data(nullptr),
- dataMap()
+ level(0),
+ skillLevelWidth(0),
+ id(0),
+ range(0),
+ modifiable(false),
+ visible(false)
{
dataMap[0] = new SkillData();
data = dataMap[0];
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index cfc55d053..343d74781 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -35,20 +35,19 @@ typedef SkillDataMap::const_iterator SkillDataMapCIter;
struct SkillInfo final
{
- int level;
std::string skillLevel;
- int skillLevelWidth;
- unsigned int id;
- bool modifiable;
- bool visible;
- SkillModel *model;
std::string skillExp;
float progress;
- int range;
gcn::Color color;
-
- SkillData *data;
SkillDataMap dataMap;
+ SkillModel *model;
+ SkillData *data;
+ int level;
+ int skillLevelWidth;
+ unsigned int id;
+ int range;
+ bool modifiable;
+ bool visible;
SkillInfo();
A_DELETE_COPY(SkillInfo)