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

CAdvMapInt: improve hero reminder by checking hero path

Browse Source 
Dialog won't show up if movement points insufficient for first step on current path.
This commit is contained in:
Arseniy Shestakov
2018-02-24 21:49:42 +08:00
parent 968bd4a7da
commit 434deffb54
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/windows/CAdvmapInterface.cpp
View File

@@ -830,14 +830,23 @@ void CAdvMapInt::fendTurn()
if(!LOCPLINT->makingTurn)
return;
if ( settings["adventure"]["heroReminder"].Bool())
if(settings["adventure"]["heroReminder"].Bool())
{
for (int i = 0; i < LOCPLINT->wanderingHeroes.size(); i++)
if (!isHeroSleeping(LOCPLINT->wanderingHeroes[i]) && (LOCPLINT->wanderingHeroes[i]->movement > 0))
for(auto hero : LOCPLINT->wanderingHeroes)
{
if(!isHeroSleeping(hero) && hero->movement > 0)
{
LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[55], std::bind(&CAdvMapInt::endingTurn, this), 0, false);
return;
// Only show hero reminder if conditions met:
// - There still movement points
// - Hero don't have a path or there not points for first step on path
auto path = LOCPLINT->getAndVerifyPath(hero);
if(!path || path->nodes.size() < 2 || !path->nodes[path->nodes.size()-2].turns)
{
LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[55], std::bind(&CAdvMapInt::endingTurn, this), 0, false);
return;
}
}
}
}
endingTurn();
}