mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-15 01:24:45 +02:00
fix two
This commit is contained in:
@ -401,12 +401,12 @@ void CExchangeWindow::update()
|
|||||||
{
|
{
|
||||||
if(isMoreSkillsThanSlots)
|
if(isMoreSkillsThanSlots)
|
||||||
{
|
{
|
||||||
secSkillsFull = std::make_shared<CMultiLineLabel>(Rect(Point(32 + 36 * m + 454 * leftRight, qeLayout ? 83 : 88), Point(34, 28)), EFonts::FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE, "...");
|
secSkillsFull[leftRight] = std::make_shared<CMultiLineLabel>(Rect(Point(32 + 36 * m + 454 * leftRight, qeLayout ? 83 : 88), Point(34, 28)), EFonts::FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE, "...");
|
||||||
secSkills[leftRight][m]->setSkill(SecondarySkill::NONE);
|
secSkills[leftRight][m]->setSkill(SecondarySkill::NONE);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
secSkillsFull.reset();
|
secSkillsFull[leftRight].reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
int id = hero->secSkills[m].first;
|
int id = hero->secSkills[m].first;
|
||||||
|
@ -28,7 +28,7 @@ class CExchangeWindow : public CStatusbarWindow, public IGarrisonHolder, public
|
|||||||
|
|
||||||
std::vector<std::shared_ptr<LRClickableAreaWTextComp>> primSkillAreas;
|
std::vector<std::shared_ptr<LRClickableAreaWTextComp>> primSkillAreas;
|
||||||
std::array<std::vector<std::shared_ptr<CSecSkillPlace>>, 2> secSkills;
|
std::array<std::vector<std::shared_ptr<CSecSkillPlace>>, 2> secSkills;
|
||||||
std::shared_ptr<CMultiLineLabel> secSkillsFull;
|
std::array<std::shared_ptr<CMultiLineLabel>, 2> secSkillsFull;
|
||||||
|
|
||||||
std::array<std::shared_ptr<CHeroArea>, 2> heroAreas;
|
std::array<std::shared_ptr<CHeroArea>, 2> heroAreas;
|
||||||
std::array<std::shared_ptr<LRClickableAreaWText>, 2> specialtyAreas;
|
std::array<std::shared_ptr<LRClickableAreaWText>, 2> specialtyAreas;
|
||||||
|
Reference in New Issue
Block a user