games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

- Fixed mantis #1421

Browse Source 
- Fixed initial map selection in campaign bonus screen
This commit is contained in:
beegee1
2013-12-17 17:14:55 +00:00
parent d1002f7e8f
commit 61fc216a6f
3 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/CPreGame.cpp
View File

@@ -3186,16 +3186,20 @@ void CBonusSelection::init()
bonuses = new CHighlightableButtonsGroup(bind(&CBonusSelection::selectBonus, this, _1));
//set left part of window
for (int g=0; g<ourCampaign->camp->scenarios.size(); ++g)
bool isCurrentMapConquerable = ourCampaign->currentMap && ourCampaign->camp->conquerable(*ourCampaign->currentMap);
for(int g = 0; g < ourCampaign->camp->scenarios.size(); ++g)
{
if(ourCampaign->camp->conquerable(g))
{
regions.push_back(new CRegion(this, true, true, g));
regions[regions.size()-1]->rclickText = ourCampaign->camp->scenarios[g].regionText;
if (highlightedRegion == nullptr)
if(highlightedRegion == nullptr)
{
highlightedRegion = regions.back();
selectMap(g, true);
if(!isCurrentMapConquerable || (isCurrentMapConquerable && g == *ourCampaign->currentMap))
{
highlightedRegion = regions.back();
selectMap(g, true);
}
}
}
else if (ourCampaign->camp->scenarios[g].conquered) //display as striped