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

tpreferences: use initializer list for accl speeds

Browse source
This commit is contained in:
Charles Dang 2016-03-31 17:02:05 +11:00
parent 3ac7f8d970
commit 1ae22aa046
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/dialogs/preferences_dialog.cpp
View file

@ -116,7 +116,10 @@ tpreferences::tpreferences(CVideo& video, const config& game_cfg)
, adv_preferences_cfg_()
, friend_names_()
, last_selected_item_(0)
, accl_speeds_()
, accl_speeds_(
// IMPORTANT: NEVER have trailing zeroes here, or else the cast from doubles
// to string will not match, since lexical_cast strips trailing zeroes.
{"0.25", "0.5", "0.75", "1", "1.25", "1.5", "1.75", "2", "3", "4", "8", "16" })
, visible_hotkeys_()
, font_scaling_(font_scaling())
, index_(0,0)
@ -127,14 +130,6 @@ tpreferences::tpreferences(CVideo& video, const config& game_cfg)
std::sort(adv_preferences_cfg_.begin(), adv_preferences_cfg_.end(),
advanced_preferences_sorter());
// IMPORTANT: NEVER have trailing zeroes here, or else the cast from doubles
// to string will not match, since lexical_cast strips trailing zeroes.
static const char* const speeds[] = {
"0.25", "0.5", "0.75", "1", "1.25", "1.5", "1.75", "2", "3", "4", "8", "16" };
const size_t num_items = sizeof(speeds)/sizeof(const char*);
accl_speeds_.insert(accl_speeds_.end(), speeds, &speeds[num_items]);
}
// Determine the template type in order to use the correct value getter