From 9651fe916f2e0e91778fd18bfacbe401f99a2de6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 28 Jul 2013 23:47:53 +0300 Subject: move bools in skillinfo. --- src/gui/widgets/skillinfo.cpp | 16 ++++++++-------- src/gui/widgets/skillinfo.h | 17 ++++++++--------- 2 files changed, 16 insertions(+), 17 deletions(-) (limited to 'src') 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) -- cgit v1.2.3-70-g09d2