diff options
Diffstat (limited to 'src/resources/skill')
| -rw-r--r-- | src/resources/skill/skilldata.cpp | 4 | ||||
| -rw-r--r-- | src/resources/skill/skillinfo.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/resources/skill/skilldata.cpp b/src/resources/skill/skilldata.cpp index 8bebf8ada..d16aefd8b 100644 --- a/src/resources/skill/skilldata.cpp +++ b/src/resources/skill/skilldata.cpp @@ -58,7 +58,7 @@ SkillData::SkillData() : SkillData::~SkillData() { - if (icon) + if (icon != nullptr) { icon->decRef(); icon = nullptr; @@ -70,7 +70,7 @@ void SkillData::setIcon(const std::string &iconPath) if (!iconPath.empty()) icon = Loader::getImage(iconPath); - if (!icon) + if (icon == nullptr) { icon = Theme::getImageFromTheme( paths.getStringValue("unknownItemFile")); diff --git a/src/resources/skill/skillinfo.cpp b/src/resources/skill/skillinfo.cpp index 7f0099a5c..8c90fbd72 100644 --- a/src/resources/skill/skillinfo.cpp +++ b/src/resources/skill/skillinfo.cpp @@ -86,7 +86,7 @@ void SkillInfo::update() if (visible == Visible_true) { visible = Visible_false; - if (model) + if (model != nullptr) model->updateVisibilities(); } return; @@ -101,7 +101,7 @@ void SkillInfo::update() } else { - if (!customSelectedLevel) + if (customSelectedLevel == 0) { // TRANSLATORS: skill level skillLevel = strprintf(_("Lvl: %d"), baseLevel); @@ -144,7 +144,7 @@ void SkillInfo::update() skillEffect.append(" ").append(toString(CAST_S32(type))); } - if (sp) + if (sp != 0) { // TRANSLATORS: skill mana skillEffect.append(strprintf(_(" / Mana: -%d"), sp)); @@ -164,11 +164,11 @@ void SkillInfo::update() skillLevelWidth = -1; - if (updateVisibility && model) + if (updateVisibility && (model != nullptr)) model->updateVisibilities(); data = getData(level); - if (!data) + if (data == nullptr) data = dataMap[0]; } |