Spiky, Snowball and Poison Ivy can move again

[supertux.git] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 047ab3e..2dba5aa 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -1,5 +1,8 @@
+//  $Id$
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobas Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -10,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -25,90 +28,38 @@
 #include "audio/sound_manager.hpp"
 #include "title.hpp"
 #include "resources.hpp"
-#include "worldmap.hpp"
+#include "worldmap/worldmap.hpp"
 #include "gettext.hpp"
+#include "options_menu.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
 
-Menu* main_menu      = 0;
-Menu* game_menu      = 0;
-Menu* options_menu   = 0;
-
-void process_options_menu()
-{
-  switch (options_menu->check()) {
-    case MNID_FULLSCREEN:
-      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:
-      break;
-  }
-}
+Menu* main_menu      = NULL;
+Menu* game_menu      = NULL;
 
 void setup_menu()
 {
   main_menu      = new Menu();
-  options_menu   = new Menu();
   game_menu      = new Menu();
-  worldmap_menu  = new Menu();
 
   main_menu->set_pos(SCREEN_WIDTH/2, 335);
   main_menu->add_entry(MNID_STARTGAME, _("Start Game"));
   main_menu->add_entry(MNID_LEVELS_CONTRIB, _("Contrib Levels"));
-  main_menu->add_submenu(_("Options"), options_menu);
-  //main_menu->add_entry(MNID_LEVELEDITOR, _("Level Editor"));
+  main_menu->add_submenu(_("Options"), get_options_menu());
   main_menu->add_entry(MNID_CREDITS, _("Credits"));
   main_menu->add_entry(MNID_QUITMAINMENU, _("Quit"));
   
-  options_menu->add_label(_("Options"));
-  options_menu->add_hl();
-  options_menu->add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen);
-  options_menu->add_toggle(MNID_SOUND, _("Sound"), config->sound_enabled);
-  options_menu->add_toggle(MNID_MUSIC, _("Music"), config->music_enabled);
-  options_menu->add_submenu(_("Setup Keys"),
-                            main_controller->get_key_options_menu());
-  options_menu->add_submenu(_("Setup Joystick"),
-                            main_controller->get_joystick_options_menu());
-  options_menu->add_hl();
-  options_menu->add_back(_("Back"));
-  
   game_menu->add_label(_("Pause"));
   game_menu->add_hl();
   game_menu->add_entry(MNID_CONTINUE, _("Continue"));
-  game_menu->add_submenu(_("Options"), options_menu);
+  game_menu->add_submenu(_("Options"), get_options_menu());
   game_menu->add_hl();
   game_menu->add_entry(MNID_ABORTLEVEL, _("Abort Level"));
-
-  worldmap_menu->add_label(_("Pause"));
-  worldmap_menu->add_hl();
-  worldmap_menu->add_entry(WorldMapNS::MNID_RETURNWORLDMAP, _("Continue"));
-  worldmap_menu->add_submenu(_("Options"), options_menu);
-  worldmap_menu->add_hl();
-  worldmap_menu->add_entry(WorldMapNS::MNID_QUITWORLDMAP, _("Quit Game"));
 }
 
 void free_menu()
 {
-  delete worldmap_menu;
   delete main_menu;
   delete game_menu;
-  delete options_menu;
+  free_options_menu();
 }