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

Fixed #382.

Browse Source
This commit is contained in:
Frank Zago 2011-09-26 00:01:47 +00:00
parent 14261d6be9
commit 5d4cfc0d0f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/CPreGame.cpp
View File

@ -597,9 +597,10 @@ void CSelectionScreen::changeSelection( const CMapInfo *to )
current = to; current = to;
if(to && screenType == CMenuScreen::loadGame) if(to && (screenType == CMenuScreen::loadGame ||
SEL->sInfo.difficulty = to->scenarioOpts->difficulty; screenType == CMenuScreen::saveGame))
if(screenType != CMenuScreen::campaignList && screenType != CMenuScreen::saveGame) SEL->sInfo.difficulty = to->scenarioOpts->difficulty;
if(screenType != CMenuScreen::campaignList)
{ {
updateStartInfo(to ? to->filename : "", sInfo, to ? to->mapHeader : NULL); updateStartInfo(to ? to->filename : "", sInfo, to ? to->mapHeader : NULL);
} }
@ -1638,14 +1639,15 @@ void InfoCard::changeSelection( const CMapInfo *to )
{ {
if(to && mapDescription) if(to && mapDescription)
{ {
if (SEL->screenType == CMenuScreen::campaignList) if (SEL->screenType == CMenuScreen::campaignList)
mapDescription->setTxt(to->campaignHeader->description); mapDescription->setTxt(to->campaignHeader->description);
else else
mapDescription->setTxt(to->mapHeader->description); mapDescription->setTxt(to->mapHeader->description);
if(SEL->screenType != CMenuScreen::newGame && SEL->screenType != CMenuScreen::campaignList) if(SEL->screenType != CMenuScreen::newGame && SEL->screenType != CMenuScreen::campaignList) {
difficulty->block(true);
difficulty->select(SEL->sInfo.difficulty, 0); difficulty->select(SEL->sInfo.difficulty, 0);
}
} }
GH.totalRedraw(); GH.totalRedraw();
} }