X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Foptions_menu.cpp;h=eb381a21d453e6dc7fda0c17df2d43f87aca16a6;hb=0262a9c0ae29d375e8174038d8cc81ebbeb10215;hp=c4c7ac9a6af096ab20e5ea0ad212d359939dafea;hpb=b8bb8a85f28cce0eaecbcd91ad7ed8fc957ef53f;p=supertux.git diff --git a/src/options_menu.cpp b/src/options_menu.cpp index c4c7ac9a6..eb381a21d 100644 --- a/src/options_menu.cpp +++ b/src/options_menu.cpp @@ -19,6 +19,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include +#include "profile_menu.hpp" #include "options_menu.hpp" #include "gui/menu.hpp" #include "audio/sound_manager.hpp" @@ -107,8 +108,12 @@ OptionsMenu::OptionsMenu() add_label(_("Options")); add_hl(); + + // FIXME: Implement me: if (get_parent() == main_menu) + add_submenu(_("Change Profile"), get_profile_menu()); + + add_submenu(_("Select Language"), language_menu.get()); add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen); - add_submenu(_("Language"), language_menu.get()); if (sound_manager->is_audio_enabled()) { add_toggle(MNID_SOUND, _("Sound"), config->sound_enabled); add_toggle(MNID_MUSIC, _("Music"), config->music_enabled); @@ -158,14 +163,13 @@ OptionsMenu::menu_action(MenuItem* item) Menu* get_options_menu() { - //if(options_menu == NULL) + //static OptionsMenu menu; options_menu = new OptionsMenu(); - return options_menu; } void free_options_menu() { delete options_menu; - options_menu = NULL; + options_menu = 0; }