games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

code review

Browse Source
This commit is contained in:
Michael
2023-08-29 21:08:18 +02:00
committed by GitHub
parent 196cd41e35
commit b6000841f1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/lobby/OptionsTab.cpp
View File

@@ -620,7 +620,7 @@ OptionsTab::SelectionWindow::SelectionWindow(PlayerColor _color, SelType _type)
for(auto & player : SEL->getStartInfo()->playerInfos) for(auto & player : SEL->getStartInfo()->playerInfos)
{ {
if(player.first != color && (int)player.second.hero > PlayerSettings::RANDOM) if(player.first != color && (int)player.second.hero > PlayerSettings::RANDOM)
unusableHeroes.push_back(player.second.hero); unusableHeroes.insert(player.second.hero);
} }
allowedBonus.push_back(-1); // random allowedBonus.push_back(-1); // random
@@ -817,7 +817,7 @@ void OptionsTab::SelectionWindow::genContentHeroes()
std::string image = "lobby/townBorderBig"; std::string image = "lobby/townBorderBig";
if(selectedHero == elem) if(selectedHero == elem)
image = "lobby/townBorderBigActivated"; image = "lobby/townBorderBigActivated";
if(std::find(unusableHeroes.begin(), unusableHeroes.end(), elem) != unusableHeroes.end()) if(unusableHeroes.count(elem))
image = "lobby/townBorderBigGrayedOut"; image = "lobby/townBorderBigGrayedOut";
components.push_back(std::make_shared<CPicture>(image, x * (ICON_BIG_WIDTH-1), y * (ICON_BIG_HEIGHT-1))); components.push_back(std::make_shared<CPicture>(image, x * (ICON_BIG_WIDTH-1), y * (ICON_BIG_HEIGHT-1)));
heroes.push_back(elem); heroes.push_back(elem);
@@ -900,7 +900,7 @@ void OptionsTab::SelectionWindow::setElement(int elem, bool doApply)
set.hero = PlayerSettings::RANDOM; set.hero = PlayerSettings::RANDOM;
} }
if(doApply && std::find(unusableHeroes.begin(), unusableHeroes.end(), heroes[elem]) != unusableHeroes.end()) if(doApply && unusableHeroes.count(heroes[elem]))
return; return;
if(set.hero.getNum() != PlayerSettings::NONE) if(set.hero.getNum() != PlayerSettings::NONE)

2
client/lobby/OptionsTab.h
View File

@@ -114,7 +114,7 @@ private:
std::vector<FactionID> factions; std::vector<FactionID> factions;
std::vector<HeroTypeID> heroes; std::vector<HeroTypeID> heroes;
std::vector<HeroTypeID> unusableHeroes; std::set<HeroTypeID> unusableHeroes;
FactionID initialFaction; FactionID initialFaction;
HeroTypeID initialHero; HeroTypeID initialHero;