games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #2708 from Laserlicht/disable_unavilable_heroes

Browse Source 
disable unavailable heroes in selection
This commit is contained in:
Ivan Savenko 2023-08-31 15:45:32 +03:00 committed by GitHub
commit ab2d4ba471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Mods/vcmi/Data/lobby/townBorderBigGrayedOut.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 604 B

29
client/lobby/OptionsTab.cpp
View File

@ -200,6 +200,11 @@ void OptionsTab::recreate()
entries.clear();
humanPlayers = 0;
for (auto selectionWindow : GH.windows().findWindows<SelectionWindow>())
{
selectionWindow->reopen();
}
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
for(auto & pInfo : SEL->getStartInfo()->playerInfos)
{
@ -612,6 +617,12 @@ OptionsTab::SelectionWindow::SelectionWindow(PlayerColor _color, SelType _type)
if(allowedHeroesFlag[i])
allowedHeroes.insert(HeroTypeID(i));
for(auto & player : SEL->getStartInfo()->playerInfos)
{
if(player.first != color && (int)player.second.hero > PlayerSettings::RANDOM)
unusableHeroes.insert(player.second.hero);
}
allowedBonus.push_back(-1); // random
if(initialHero.getNum() >= -1)
allowedBonus.push_back(0); // artifact
@ -665,6 +676,13 @@ void OptionsTab::SelectionWindow::setSelection()
CSH->setPlayerOption(LobbyChangePlayerOption::BONUS_ID, selectedBonus, color);
}
void OptionsTab::SelectionWindow::reopen()
{
std::shared_ptr<SelectionWindow> window = std::shared_ptr<SelectionWindow>(new SelectionWindow(color, type));
close();
GH.windows().pushWindow(window);
}
void OptionsTab::SelectionWindow::recreate()
{
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
@ -795,8 +813,13 @@ void OptionsTab::SelectionWindow::genContentHeroes()
CPlayerSettingsHelper helper = CPlayerSettingsHelper(set, SelType::HERO);
components.push_back(std::make_shared<CAnimImage>(helper.getImageName(true), helper.getImageIndex(true), 0, x * (ICON_BIG_WIDTH-1), y * (ICON_BIG_HEIGHT-1)));
components.push_back(std::make_shared<CPicture>(selectedHero == elem ? "lobby/townBorderBigActivated" : "lobby/townBorderBig", x * (ICON_BIG_WIDTH-1), y * (ICON_BIG_HEIGHT-1)));
drawOutlinedText(x * (ICON_BIG_WIDTH-1) + TEXT_POS_X, y * (ICON_BIG_HEIGHT-1) + TEXT_POS_Y, (selectedHero == elem) ? Colors::YELLOW : Colors::WHITE, helper.getName());
std::string image = "lobby/townBorderBig";
if(selectedHero == elem)
image = "lobby/townBorderBigActivated";
if(unusableHeroes.count(elem))
image = "lobby/townBorderBigGrayedOut";
components.push_back(std::make_shared<CPicture>(image, x * (ICON_BIG_WIDTH-1), y * (ICON_BIG_HEIGHT-1)));
heroes.push_back(elem);
i++;
@ -876,6 +899,10 @@ void OptionsTab::SelectionWindow::setElement(int elem, bool doApply)
{
set.hero = PlayerSettings::RANDOM;
}
if(doApply && unusableHeroes.count(heroes[elem]))
return;
if(set.hero.getNum() != PlayerSettings::NONE)
{
if(!doApply)

3
client/lobby/OptionsTab.h
View File

@ -114,6 +114,7 @@ private:
std::vector<FactionID> factions;
std::vector<HeroTypeID> heroes;
std::set<HeroTypeID> unusableHeroes;
FactionID initialFaction;
HeroTypeID initialHero;
@ -144,6 +145,8 @@ private:
void showPopupWindow(const Point & cursorPosition) override;
public:
void reopen();
SelectionWindow(PlayerColor _color, SelType _type);
};