- removed joystick setup menu, since it won't work anyway

[supertux.git] / src / setup.cpp

diff --git a/src/setup.cpp b/src/setup.cpp
index 4bfd9c3..fc8f269 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -55,8 +55,6 @@
 
 #include "player.h"
 
-void display_text_file(char *filename);
-
 #ifdef WIN32
 #define mkdir(dir, mode)    mkdir(dir)
 // on win32 we typically don't want LFS paths
@@ -407,9 +405,11 @@ void st_menu(void)
       options_menu->additem(MN_DEACTIVE,"Music     ", false,0, MNID_MUSIC);
     }
   options_menu->additem(MN_TOGGLE,"Show FPS  ",show_fps,0, MNID_SHOWFPS);
-  options_menu->additem(MN_GOTO,"Key Setup",0,options_keys_menu);
-  if(use_joystick)
-    options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+  options_menu->additem(MN_GOTO,"Keyboard Setup",0,options_keys_menu);
+
+  //if(use_joystick)
+  //  options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+
   options_menu->additem(MN_HL,"",0,0);
   options_menu->additem(MN_BACK,"Back",0,0);
   
@@ -498,9 +498,10 @@ bool process_load_game_menu()
 
       if (access(slotfile, F_OK) != 0)
         {
-          display_text_file("intro.txt");
+          draw_intro();
         }
 
+      fadeout();
       WorldMapNS::WorldMap worldmap;
      
       // Load the game or at least set the savegame_file variable
@@ -601,7 +602,6 @@ void st_general_free(void)
 {
 
   /* Free global images: */
-
   delete black_text;
   delete gold_text;
   delete white_text;
@@ -609,6 +609,7 @@ void st_general_free(void)
   delete red_text;
   delete white_small_text;
   delete white_big_text;
+  delete yellow_nums;
 
   /* Free GUI/menu images: */
   delete checkbox;