X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsetup.cpp;h=040f9be42e03679af2c3f2985c63455e11c43501;hb=8dbd5dc1ef48c95616ff2e32e7ac1396e4117fbd;hp=90a9d06bbf5a793e8306e567c66e129e360b9a5a;hpb=ab307846ec510e776f4f314acc58e0170133b572;p=supertux.git

diff --git a/src/setup.cpp b/src/setup.cpp
index 90a9d06bb..040f9be42 100644
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -382,7 +382,7 @@ void st_menu(void)
   main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME);
   main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB);
   main_menu->additem(MN_GOTO, "Options",0,options_menu, MNID_OPTIONMENU);
-  main_menu->additem(MN_ACTION,"Level editor",0,0, MNID_LEVELEDITOR);
+  main_menu->additem(MN_ACTION,"Level Editor",0,0, MNID_LEVELEDITOR);
   main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS);
   main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU);
 
@@ -391,7 +391,7 @@ void st_menu(void)
 #ifndef NOOPENGL
   options_menu->additem(MN_TOGGLE,"OpenGL",use_gl,0, MNID_OPENGL);
 #else
-  options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl,MNID_OPENGL);
+  options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl, 0, MNID_OPENGL);
 #endif
   options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0, MNID_FULLSCREEN);
   if(audio_device)
@@ -405,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);
   
@@ -417,7 +419,7 @@ void st_menu(void)
   options_keys_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, 0,&keymap.right);
   options_keys_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, 0,&keymap.jump);
   options_keys_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, 0,&keymap.duck);
-  options_keys_menu->additem(MN_CONTROLFIELD,"Power", 0,0, 0,&keymap.fire);
+  options_keys_menu->additem(MN_CONTROLFIELD,"Power/Run", 0,0, 0,&keymap.fire);
   options_keys_menu->additem(MN_HL,"",0,0);
   options_keys_menu->additem(MN_BACK,"Back",0,0);
 
@@ -499,6 +501,7 @@ bool process_load_game_menu()
           draw_intro();
         }
 
+      fadeout();
       WorldMapNS::WorldMap worldmap;
      
       // Load the game or at least set the savegame_file variable
@@ -599,7 +602,6 @@ void st_general_free(void)
 {
 
   /* Free global images: */
-
   delete black_text;
   delete gold_text;
   delete white_text;
@@ -607,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;
@@ -661,7 +664,7 @@ void st_video_setup_sdl(void)
 
   if (use_fullscreen)
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN ) ; /* | SDL_HWSURFACE); */
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_FULLSCREEN ) ; /* | SDL_HWSURFACE); */
       if (screen == NULL)
         {
           fprintf(stderr,
@@ -674,7 +677,7 @@ void st_video_setup_sdl(void)
     }
   else
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_HWSURFACE | SDL_DOUBLEBUF );
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_HWSURFACE | SDL_DOUBLEBUF );
 
       if (screen == NULL)
         {
@@ -699,7 +702,7 @@ void st_video_setup_gl(void)
 
   if (use_fullscreen)
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN | SDL_OPENGL) ; /* | SDL_HWSURFACE); */
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_FULLSCREEN | SDL_OPENGL) ; /* | SDL_HWSURFACE); */
       if (screen == NULL)
         {
           fprintf(stderr,
@@ -712,7 +715,7 @@ void st_video_setup_gl(void)
     }
   else
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_OPENGL);
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_OPENGL);
 
       if (screen == NULL)
         {