Removed stray code from -nogl branch

[supertux.git] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index ee48229..b8279b5 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -16,12 +16,18 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
 
-#include "misc.h"
-#include "main.h"
-#include "gameconfig.h"
-#include "app/globals.h"
-#include "game_session.h"
-#include "control/joystickkeyboardcontroller.h"
+#include "misc.hpp"
+#include "main.hpp"
+#include "gameconfig.hpp"
+#include "game_session.hpp"
+#include "gui/menu.hpp"
+#include "gui/button.hpp"
+#include "audio/sound_manager.hpp"
+#include "title.hpp"
+#include "resources.hpp"
+#include "worldmap.hpp"
+#include "gettext.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
 
 Menu* main_menu      = 0;
 Menu* game_menu      = 0;
@@ -41,18 +47,21 @@ void process_options_menu()
       if(config->use_fullscreen != options_menu->is_toggled(MNID_FULLSCREEN)) {
         config->use_fullscreen = !config->use_fullscreen;
         init_video();
+        config->save();
       }
       break;
     case MNID_SOUND:
       if(config->sound_enabled != options_menu->is_toggled(MNID_SOUND)) {
         config->sound_enabled = !config->sound_enabled;
         sound_manager->enable_sound(config->sound_enabled);
+        config->save();
       }
       break;
     case MNID_MUSIC:
       if(config->music_enabled != options_menu->is_toggled(MNID_MUSIC)) {
         config->music_enabled = !config->music_enabled;
         sound_manager->enable_music(config->music_enabled);
+        config->save();
       }
       break;
     default:
@@ -74,7 +83,7 @@ void setup_menu()
   main_menu->add_submenu(_("Start Game"), load_game_menu, MNID_STARTGAME);
   main_menu->add_submenu(_("Contrib Levels"), contrib_menu, MNID_LEVELS_CONTRIB);
   main_menu->add_submenu(_("Options"), options_menu);
-  main_menu->add_entry(MNID_LEVELEDITOR, _("Level Editor"));
+  //main_menu->add_entry(MNID_LEVELEDITOR, _("Level Editor"));
   main_menu->add_entry(MNID_CREDITS, _("Credits"));
   main_menu->add_entry(MNID_QUITMAINMENU, _("Quit"));