-renamed ViewPort to Camera

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index b7a3ade..a2fa619 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -52,7 +52,6 @@
 #include "resources.h"
 
 static Surface* bkg_title;
-static Surface* bkg_credits;
 static Surface* logo;
 static Surface* img_choose_subset;
 
@@ -127,7 +126,7 @@ void check_contrib_menu()
               for (int i = 1; i <= subset.levels; ++i)
                 {
                   Level level;
-                  level.load(subset.name, i);
+                  level.load(subset.name, i, 0);
                   contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0, i);
                 }
               contrib_subset_menu->additem(MN_HL,"",0,0);      
@@ -193,7 +192,6 @@ void draw_demo(GameSession* session, double frame_ratio)
   if(plevel->width * 32 - 320 < tux->base.x)
     {
       tux->level_begin();
-      scroll_x = 0;
     }
 
   tux->can_jump = true;
@@ -227,8 +225,7 @@ void title(void)
   updatescreen();
 
   /* Load images: */
-  bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA);
-  bkg_credits = new Surface(datadir + "/images/background/oiltux.jpg", IGNORE_ALPHA);
+  bkg_title = new Surface(datadir + "/images/background/arctis.jpg", IGNORE_ALPHA);
   logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA);
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
 
@@ -305,7 +302,7 @@ void title(void)
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_credits, SCROLL_SPEED_CREDITS);
+                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:
@@ -341,8 +338,6 @@ void title(void)
               else if (process_load_game_menu())
                 {
                   // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
-                  // reset tux
-                  scroll_x = 0;
                   //titletux.level_begin();
                   update_time = st_get_ticks();
                 }
@@ -373,7 +368,6 @@ void title(void)
 
   free_contrib_menu();
   delete bkg_title;
-  delete bkg_credits;
   delete logo;
   delete img_choose_subset;
 }