diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp index e13be5cbd9..b13fdbeeb9 100644 --- a/apps/openmw/mwgui/levelupdialog.cpp +++ b/apps/openmw/mwgui/levelupdialog.cpp @@ -27,7 +27,7 @@ namespace { constexpr unsigned int sMaxCoins = 3; - constexpr int sCols[] = { 32, 218 }; + constexpr int sColumnOffsets[] = { 32, 218 }; } namespace MWGui { @@ -47,11 +47,11 @@ namespace MWGui { const auto& store = MWBase::Environment::get().getESMStore()->get(); const size_t perCol - = static_cast(std::ceil(store.getSize() / static_cast(std::size(sCols)))); + = static_cast(std::ceil(store.getSize() / static_cast(std::size(sColumnOffsets)))); size_t i = 0; for (const ESM::Attribute& attribute : store) { - const int offset = sCols[i / perCol]; + const int offset = sColumnOffsets[i / perCol]; const int row = static_cast(i % perCol); Widgets widgets; widgets.mMultiplier = mAssignWidget->createWidget( diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp index fd5a5befbc..76c1b065dd 100644 --- a/apps/openmw/mwgui/statswindow.cpp +++ b/apps/openmw/mwgui/statswindow.cpp @@ -47,17 +47,17 @@ namespace MWGui const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore(); MyGUI::Widget* attributeView = getWidget("AttributeView"); MyGUI::IntCoord coord{ 0, 0, 204, 18 }; - const MyGUI::Align align = MyGUI::Align::Left | MyGUI::Align::Top | MyGUI::Align::HStretch; + const MyGUI::Align alignment = MyGUI::Align::Left | MyGUI::Align::Top | MyGUI::Align::HStretch; for (const ESM::Attribute& attribute : store.get()) { - auto* box = attributeView->createWidget({}, coord, align); + auto* box = attributeView->createWidget({}, coord, alignment); box->setUserString("ToolTipType", "Layout"); box->setUserString("ToolTipLayout", "AttributeToolTip"); box->setUserString("Caption_AttributeName", attribute.mName); box->setUserString("Caption_AttributeDescription", attribute.mDescription); box->setUserString("ImageTexture_AttributeImage", attribute.mIcon); coord.top += coord.height; - auto* name = box->createWidget("SandText", { 0, 0, 160, 18 }, align); + auto* name = box->createWidget("SandText", { 0, 0, 160, 18 }, alignment); name->setNeedMouseFocus(false); name->setCaption(attribute.mName); auto* value = box->createWidget(