Allow saving default time limit option too

This commit is contained in:
Benau 2016-01-22 12:27:09 +08:00
parent 99162e3d0f
commit ea05f4b6ba
2 changed files with 7 additions and 3 deletions

View File

@ -341,6 +341,9 @@ namespace UserConfigParams
PARAM_PREFIX IntUserConfigParam m_soccer_time_limit PARAM_PREFIX IntUserConfigParam m_soccer_time_limit
PARAM_DEFAULT( IntUserConfigParam(3, "soccer-time-limit", PARAM_DEFAULT( IntUserConfigParam(3, "soccer-time-limit",
&m_race_setup_group, "Time limit in soccer mode.") ); &m_race_setup_group, "Time limit in soccer mode.") );
PARAM_PREFIX BoolUserConfigParam m_soccer_use_time_limit
PARAM_DEFAULT( BoolUserConfigParam(false, "soccer-use-time-limit",
&m_race_setup_group, "Enable time limit in soccer mode.") );
PARAM_PREFIX IntUserConfigParam m_difficulty PARAM_PREFIX IntUserConfigParam m_difficulty
PARAM_DEFAULT( IntUserConfigParam(0, "difficulty", PARAM_DEFAULT( IntUserConfigParam(0, "difficulty",
&m_race_setup_group, &m_race_setup_group,

View File

@ -99,6 +99,7 @@ void SoccerSetupScreen::eventCallback(Widget* widget, const std::string& name,
{ {
CheckBoxWidget* timeEnabled = dynamic_cast<CheckBoxWidget*>(widget); CheckBoxWidget* timeEnabled = dynamic_cast<CheckBoxWidget*>(widget);
bool timed = timeEnabled->getState(); bool timed = timeEnabled->getState();
UserConfigParams::m_soccer_use_time_limit = timed;
getWidget<SpinnerWidget>("goalamount")->setActive(!timed); getWidget<SpinnerWidget>("goalamount")->setActive(!timed);
getWidget<SpinnerWidget>("timeamount")->setActive(timed); getWidget<SpinnerWidget>("timeamount")->setActive(timed);
} }
@ -184,14 +185,14 @@ void SoccerSetupScreen::init()
SpinnerWidget* goalamount = getWidget<SpinnerWidget>("goalamount"); SpinnerWidget* goalamount = getWidget<SpinnerWidget>("goalamount");
goalamount->setValue(UserConfigParams::m_num_goals); goalamount->setValue(UserConfigParams::m_num_goals);
goalamount->setActive(true); goalamount->setActive(!UserConfigParams::m_soccer_use_time_limit);
SpinnerWidget* timeAmount = getWidget<SpinnerWidget>("timeamount"); SpinnerWidget* timeAmount = getWidget<SpinnerWidget>("timeamount");
timeAmount->setValue(UserConfigParams::m_soccer_time_limit); timeAmount->setValue(UserConfigParams::m_soccer_time_limit);
timeAmount->setActive(false); timeAmount->setActive(UserConfigParams::m_soccer_use_time_limit);
CheckBoxWidget* timeEnabled = getWidget<CheckBoxWidget>("time_enabled"); CheckBoxWidget* timeEnabled = getWidget<CheckBoxWidget>("time_enabled");
timeEnabled->setState(false); timeEnabled->setState(UserConfigParams::m_soccer_use_time_limit);
// Set focus on "continue" // Set focus on "continue"
ButtonWidget* bt_continue = getWidget<ButtonWidget>("continue"); ButtonWidget* bt_continue = getWidget<ButtonWidget>("continue");