0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MP Create Game: fixed widespread typo

Browse source
This commit is contained in:
Charles Dang 2016-09-30 21:08:47 +11:00
parent 688c3f600d
commit fe2e119b25
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/window/mp_create_game.cfg
View file

@ -451,7 +451,7 @@
{_GUI_MP_CREATE_OPTION_SLIDER ( _ "Turn Bonus") "turn_bonus" 10 300 ( _ "Time for general tasks each turn (seconds)") ()}
{_GUI_MP_CREATE_OPTION_SLIDER ( _ "Reservior") "reservior" 30 1500 ( _ "Longest time possible for any turn (seconds)") ()}
{_GUI_MP_CREATE_OPTION_SLIDER ( _ "Reservoir") "reservoir" 30 1500 ( _ "Longest time possible for any turn (seconds)") ()}
{_GUI_MP_CREATE_OPTION_SLIDER ( _ "Action Bonus") "action_bonus" 0 30 ( _ "Time for each attack, recruit, and capture") ()}

10
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -83,7 +83,7 @@ tmp_create_game::tmp_create_game(const config& cfg, ng::create_engine& create_en
, experience_(register_integer("experience_modifier", true, prefs::xp_modifier, prefs::set_xp_modifier))
, init_turn_limit_(register_integer("init_turn_limit", true, prefs::countdown_init_time, prefs::set_countdown_init_time))
, turn_bonus_(register_integer("turn_bonus", true, prefs::countdown_turn_bonus, prefs::set_countdown_turn_bonus))
, reservior_(register_integer("reservior", true, prefs::countdown_reservoir_time, prefs::set_countdown_reservoir_time))
, reservoir_(register_integer("reservoir", true, prefs::countdown_reservoir_time, prefs::set_countdown_reservoir_time))
, action_bonus_(register_integer("action_bonus", true, prefs::countdown_action_bonus, prefs::set_countdown_action_bonus))
{
level_types_ = {
@ -293,7 +293,7 @@ void tmp_create_game::pre_show(twindow& window)
bind_status_label<tslider>(window, init_turn_limit_->id());
bind_status_label<tslider>(window, turn_bonus_->id());
bind_status_label<tslider>(window, reservior_->id());
bind_status_label<tslider>(window, reservoir_->id());
bind_status_label<tslider>(window, action_bonus_->id());
//
@ -352,7 +352,7 @@ void tmp_create_game::pre_show(twindow& window)
UPDATE_ATTRIBUTE(time_limit, to_bool);
UPDATE_ATTRIBUTE(init_turn_limit, to_int);
UPDATE_ATTRIBUTE(turn_bonus, to_int);
UPDATE_ATTRIBUTE(reservior, to_int);
UPDATE_ATTRIBUTE(reservoir, to_int);
UPDATE_ATTRIBUTE(action_bonus, to_int);
UPDATE_ATTRIBUTE(observers, to_bool);
UPDATE_ATTRIBUTE(registered_users, to_bool);
@ -703,7 +703,7 @@ void tmp_create_game::update_map_settings(twindow& window)
init_turn_limit_->widget_set_enabled(window, time_limit, false);
turn_bonus_ ->widget_set_enabled(window, time_limit, false);
reservior_ ->widget_set_enabled(window, time_limit, false);
reservoir_ ->widget_set_enabled(window, time_limit, false);
action_bonus_ ->widget_set_enabled(window, time_limit, false);
if(use_map_settings) {
@ -796,7 +796,7 @@ void tmp_create_game::post_show(twindow& window)
config_engine_->set_mp_countdown(time_limit_->get_widget_value(window));
config_engine_->set_mp_countdown_init_time(init_turn_limit_->get_widget_value(window));
config_engine_->set_mp_countdown_turn_bonus(turn_bonus_->get_widget_value(window));
config_engine_->set_mp_countdown_reservoir_time(reservior_->get_widget_value(window));
config_engine_->set_mp_countdown_reservoir_time(reservoir_->get_widget_value(window));
config_engine_->set_mp_countdown_action_bonus(action_bonus_->get_widget_value(window));
config_engine_->set_allow_observers(observers_->get_widget_value(window));

2
src/gui/dialogs/multiplayer/mp_create_game.hpp
View file

@ -103,7 +103,7 @@ private:
tfield_integer* experience_;
tfield_integer* init_turn_limit_;
tfield_integer* turn_bonus_;
tfield_integer* reservior_;
tfield_integer* reservoir_;
tfield_integer* action_bonus_;
template<typename widget>