projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed unused max_score_multiplier and score_multiplier
[supertux.git]
/
src
/
options_menu.cpp
diff --git
a/src/options_menu.cpp
b/src/options_menu.cpp
index
6a5b364
..
ccadc44
100644
(file)
--- a/
src/options_menu.cpp
+++ b/
src/options_menu.cpp
@@
-71,13
+71,13
@@
public:
config->locale = "";
dictionary_manager.set_language(config->locale);
config->save();
config->locale = "";
dictionary_manager.set_language(config->locale);
config->save();
- Menu::
set_current(0
);
+ Menu::
pop_current(
);
}
else if (item->id == 1) {
config->locale = "en";
dictionary_manager.set_language(config->locale);
config->save();
}
else if (item->id == 1) {
config->locale = "en";
dictionary_manager.set_language(config->locale);
config->save();
- Menu::
set_current(0
);
+ Menu::
pop_current(
);
}
int mnid = 10;
std::set<std::string> languages = dictionary_manager.get_languages();
}
int mnid = 10;
std::set<std::string> languages = dictionary_manager.get_languages();
@@
-87,7
+87,7
@@
public:
config->locale = locale_name;
dictionary_manager.set_language(config->locale);
config->save();
config->locale = locale_name;
dictionary_manager.set_language(config->locale);
config->save();
- Menu::
set_current(0
);
+ Menu::
pop_current(
);
}
}
}
}
}
}
@@
-214,8
+214,8
@@
OptionsMenu::OptionsMenu()
add_toggle(MNID_MUSIC, _("Music"), config->music_enabled)
->set_help(_("Disable all music"));
} else {
add_toggle(MNID_MUSIC, _("Music"), config->music_enabled)
->set_help(_("Disable all music"));
} else {
- add_
de
active(MNID_SOUND, _("Sound (disabled)"));
- add_
de
active(MNID_MUSIC, _("Music (disabled)"));
+ add_
in
active(MNID_SOUND, _("Sound (disabled)"));
+ add_
in
active(MNID_MUSIC, _("Music (disabled)"));
}
add_submenu(_("Setup Keyboard"), main_controller->get_key_options_menu())
}
add_submenu(_("Setup Keyboard"), main_controller->get_key_options_menu())
@@
-279,7
+279,8
@@
OptionsMenu::menu_action(MenuItem* item)
case MNID_FULLSCREEN:
if(config->use_fullscreen != options_menu->is_toggled(MNID_FULLSCREEN)) {
config->use_fullscreen = !config->use_fullscreen;
case MNID_FULLSCREEN:
if(config->use_fullscreen != options_menu->is_toggled(MNID_FULLSCREEN)) {
config->use_fullscreen = !config->use_fullscreen;
- init_video();
+ init_video(); // FIXME: Should call apply_config instead
+ Menu::recalc_pos();
config->save();
}
break;
config->save();
}
break;