confirm_dialog now accepts a background, instead of doing the screen capture hack.

[supertux.git] / src / setup.cpp

diff --git a/src/setup.cpp b/src/setup.cpp
index 98cc84c..dbec4db 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -51,7 +51,7 @@
 #include "worldmap.h"
 #include "resources.h"
 #include "intro.h"
-#include "music_manager.h"
+#include "sound_manager.h"
 
 #include "player.h"
 
@@ -424,6 +424,8 @@ void st_menu(void)
   options_keys_menu->additem(MN_CONTROLFIELD_KB,"Right move", 0,0, 0,&keymap.right);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,"Jump", 0,0, 0,&keymap.jump);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,"Duck", 0,0, 0,&keymap.duck);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,"Activate", 0, 0, 0,
+          &keymap.activate);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,"Power/Run", 0,0, 0,&keymap.fire);
   options_keys_menu->additem(MN_HL,"",0,0);
   options_keys_menu->additem(MN_BACK,"Back",0,0);
@@ -506,7 +508,7 @@ bool process_load_game_menu()
         }
 
       // shrink_fade(Point((screen->w/2),(screen->h/2)), 1000);
-      fadeout();
+      fadeout(256);
       WorldMapNS::WorldMap worldmap;
      
       // Load the game or at least set the savegame_file variable
@@ -556,7 +558,7 @@ void process_options_menu(void)
       if(use_music != options_menu->isToggled(MNID_MUSIC))
         {
           use_music = !use_music;
-          music_manager->enable_music(use_music);
+          sound_manager->enable_music(use_music);
         }
       break;
     case MNID_SHOWFPS: