- fixed some crashes where there was an invalid tile number

[supertux.git] / src / setup.cpp

diff --git a/src/setup.cpp b/src/setup.cpp
index af82009..dbec4db 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -42,8 +42,8 @@
 #include "defines.h"
 #include "globals.h"
 #include "setup.h"
-#include "screen.h"
-#include "texture.h"
+#include "screen/screen.h"
+#include "screen/texture.h"
 #include "menu.h"
 #include "gameloop.h"
 #include "configfile.h"
@@ -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);
@@ -505,7 +507,8 @@ bool process_load_game_menu()
           draw_intro();
         }
 
-      fadeout();
+      // shrink_fade(Point((screen->w/2),(screen->h/2)), 1000);
+      fadeout(256);
       WorldMapNS::WorldMap worldmap;
      
       // Load the game or at least set the savegame_file variable
@@ -555,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:
@@ -581,16 +584,19 @@ void st_general_setup(void)
 
   /* Load global images: */
 
-  black_text  = new Text(datadir + "/images/status/letters-black.png", TEXT_TEXT, 16,18);
-  gold_text   = new Text(datadir + "/images/status/letters-gold.png", TEXT_TEXT, 16,18);
-  silver_text = new Text(datadir + "/images/status/letters-silver.png", TEXT_TEXT, 16,18);
-  blue_text   = new Text(datadir + "/images/status/letters-blue.png", TEXT_TEXT, 16,18);
-  red_text    = new Text(datadir + "/images/status/letters-red.png", TEXT_TEXT, 16,18);
-  green_text  = new Text(datadir + "/images/status/letters-green.png", TEXT_TEXT, 16,18);
-  white_text  = new Text(datadir + "/images/status/letters-white.png", TEXT_TEXT, 16,18);
-  white_small_text = new Text(datadir + "/images/status/letters-white-small.png", TEXT_TEXT, 8,9);
-  white_big_text   = new Text(datadir + "/images/status/letters-white-big.png", TEXT_TEXT, 20,22);
-  yellow_nums = new Text(datadir + "/images/status/numbers.png", TEXT_NUM, 32,32);
+  black_text  = new Font(datadir + "/images/status/letters-black.png", TEXT_TEXT, 16,18);
+  gold_text   = new Font(datadir + "/images/status/letters-gold.png", TEXT_TEXT, 16,18);
+  silver_text = new Font(datadir + "/images/status/letters-silver.png", TEXT_TEXT, 16,18);
+  blue_text   = new Font(datadir + "/images/status/letters-blue.png", TEXT_TEXT,
+      16,18, 3);
+  red_text    = new Font(datadir + "/images/status/letters-red.png", TEXT_TEXT, 16,18);
+  green_text  = new Font(datadir + "/images/status/letters-green.png", TEXT_TEXT, 16,18);
+  white_text  = new Font(datadir + "/images/status/letters-white.png", TEXT_TEXT, 16,18);
+  white_small_text = new Font(datadir +
+      "/images/status/letters-white-small.png", TEXT_TEXT, 8,9, 1);
+  white_big_text   = new Font(datadir + "/images/status/letters-white-big.png",
+      TEXT_TEXT, 20,22, 3);
+  yellow_nums = new Font(datadir + "/images/status/numbers.png", TEXT_NUM, 32,32);
 
   /* Load GUI/menu images: */
   checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA);
@@ -1051,8 +1057,8 @@ void parseargs(int argc, char * argv[])
                "Misc Options:\n"
                "  -j, --joystick NUM  Use joystick NUM (default: 0)\n" 
                "  --joymap XAXIS:YAXIS:A:B:START\n"
-               "  --leveleditor       Opens the leveleditor in a file. (Only works when a file is provided.)\n"
                "                      Define how joystick buttons and axis should be mapped\n"
+               "  --leveleditor       Opens the leveleditor in a file. (Only works when a file is provided.)\n"
                "  -d, --datadir DIR   Load Game data from DIR (default: automatic)\n"
                "  --debug-mode        Enables the debug-mode, which is useful for developers.\n"
                "  --help              Display a help message summarizing command-line\n"
@@ -1093,7 +1099,7 @@ void usage(char * prog, int ret)
 
   /* Display the usage message: */
 
-  fprintf(fi, "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug-mode] | [--usage | --help | --version] [--worldmap] FILENAME\n",
+  fprintf(fi, "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n",
           prog);