From 9d5fc7954f07d4b1d96592ba4e2da07912740cb6 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Tue, 5 Mar 2019 22:50:27 +0000 Subject: [PATCH] DRY skill widget updates in stats window The skill widgets were configured in two places: initial creation, and updates. The former was redundant, and duplicated the functionality of the latter. To fix this redundancy, replace the duplicate code with a call to setValue. --- apps/openmw/mwgui/statswindow.cpp | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp index fdc7bb6d20..c3f852c5b7 100644 --- a/apps/openmw/mwgui/statswindow.cpp +++ b/apps/openmw/mwgui/statswindow.cpp @@ -438,9 +438,6 @@ namespace MWGui if (skillId < 0 || skillId >= ESM::Skill::Length) // Skip unknown skill indexes continue; const std::string &skillNameId = ESM::Skill::sSkillNameIds[skillId]; - const MWMechanics::SkillValue &stat = mSkillValues.find(skillId)->second; - int base = stat.getBase(); - int modified = stat.getModified(); const MWWorld::ESMStore &esmStore = MWBase::Environment::get().getWorld()->getStore(); @@ -452,13 +449,9 @@ namespace MWGui const ESM::Attribute* attr = esmStore.get().find(skill->mData.mAttribute); - std::string state = "normal"; - if (modified > base) - state = "increased"; - else if (modified < base) - state = "decreased"; std::pair widgets = addValueItem(MWBase::Environment::get().getWindowManager()->getGameSettingString(skillNameId, skillNameId), - MyGUI::utility::toString(static_cast(modified)), state, coord1, coord2); + "", "normal", coord1, coord2); + mSkillWidgetMap[skillId] = widgets; for (int i=0; i<2; ++i) { @@ -469,27 +462,9 @@ namespace MWGui mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_SkillAttribute", "#{sGoverningAttribute}: #{" + attr->mName + "}"); mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ImageTexture_SkillImage", icon); mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Range_SkillProgress", "100"); - if (base < 100) - { - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Visible_SkillMaxed", "false"); - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("UserData^Hidden_SkillMaxed", "true"); - - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Visible_SkillProgressVBox", "true"); - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("UserData^Hidden_SkillProgressVBox", "false"); - - setSkillProgress(mSkillWidgets[mSkillWidgets.size()-1-i], stat.getProgress(), skillId); - } - else - { - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Visible_SkillMaxed", "true"); - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("UserData^Hidden_SkillMaxed", "false"); - - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Visible_SkillProgressVBox", "false"); - mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("UserData^Hidden_SkillProgressVBox", "true"); - } } - mSkillWidgetMap[skillId] = widgets; + setValue(static_cast(skillId), mSkillValues.find(skillId)->second); } }