games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

- spellbook fix (#1110)

Browse Source 
- possible fix for kingdom overview (#1109)
- tweaks for recruit window (part of #1113)
This commit is contained in:
Ivan Savenko
2012-09-30 10:35:17 +00:00
parent 7dc3e98c25
commit 07f9cb16c5
7 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/GUIClasses.cpp
View File

@ -1377,10 +1377,10 @@ void CRecruitmentWindow::select(CCreatureCard *card)
slider->setAmount(maxAmount);
if(slider->value)
slider->moveTo(0);
if(slider->value != maxAmount)
slider->moveTo(maxAmount);
else // if slider already at 0 - emulate call to sliderMoved()
sliderMoved(0);
sliderMoved(maxAmount);
costPerTroopValue->createItems(card->creature->cost);
totalCostValue->createItems(card->creature->cost);
@ -1533,10 +1533,10 @@ void CRecruitmentWindow::availableCreaturesChanged()
//restore selection
select(cards[selectedIndex]);
if(slider->value)
slider->moveTo(0);
if(slider->value == slider->amount)
slider->moveTo(slider->amount);
else // if slider already at 0 - emulate call to sliderMoved()
sliderMoved(0);
sliderMoved(slider->amount);
}
void CRecruitmentWindow::sliderMoved(int to)
@ -3295,7 +3295,8 @@ void CSystemOptionsWindow::setMapScrollingSpeed( int newSpeed )
}
CSystemOptionsWindow::CSystemOptionsWindow():
CWindowObject(PLAYER_COLORED, "SysOpBck")
CWindowObject(PLAYER_COLORED, "SysOpBck"),
onFullscreenChanged(settings.listen["video"]["fullscreen"])
{
//TODO: translation and\or config file
static const std::string fsLabel = "Fullscreen";
@ -3402,6 +3403,8 @@ CSystemOptionsWindow::CSystemOptionsWindow():
newCreatureWin->select(settings["general"]["classicCreatureWindow"].Bool());
fullscreen->select(settings["video"]["fullscreen"].Bool());
onFullscreenChanged([&](const JsonNode &newState){ fullscreen->select(newState.Bool());});
gameResButton = new CAdventureMapButton("", rsHelp, boost::bind(&CSystemOptionsWindow::selectGameRes, this), 28, 275,"SYSOB12", SDLK_g);
std::string resText;