#include "worldmap.h"
#include "resources.h"
#include "intro.h"
-#include "music_manager.h"
+#include "sound_manager.h"
#include "player.h"
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);
}
// 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
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: