converted player to new object system

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 8f9b46b..3b14759 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -147,7 +147,7 @@ void check_contrib_subset_menu()
     {
       if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION)
         {
-          std::cout << "Sarting level: " << index << std::endl;
+          std::cout << "Starting level: " << index << std::endl;
           GameSession session(current_contrib_subset, index, ST_GL_PLAY);
           session.run();
           player_status.reset();
@@ -191,8 +191,8 @@ void draw_demo(GameSession* session, double frame_ratio)
   // Wrap around at the end of the level back to the beginnig
   if(plevel->width * 32 - 320 < tux->base.x)
     {
-      tux->base.x = tux->base.x - (plevel->width * 32 - 640);
-      scroll_x = tux->base.x - 320;
+      tux->level_begin();
+      scroll_x = 0;
     }
 
   tux->can_jump = true;
@@ -226,7 +226,7 @@ void title(void)
   updatescreen();
 
   /* Load images: */
-  bkg_title = new Surface(datadir + "/images/title/background.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);
 
@@ -269,14 +269,14 @@ void title(void)
       draw_demo(&session, frame_ratio);
       
       if (Menu::current() == main_menu)
-        logo->draw( 160, 30);
+        logo->draw(screen->w/2 - logo->w/2, 30);
 
       white_small_text->draw(" SuperTux " VERSION "\n"
                              "Copyright (c) 2003 SuperTux Devel Team\n"
                              "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
                              "are welcome to redistribute it under certain conditions; see the file COPYING\n"
                              "for details.\n",
-                             0, 420, 0);
+                             0, screen->h - 70, 0);
 
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
@@ -333,6 +333,7 @@ void title(void)
                   }
 
                 update_load_save_game_menu(load_game_menu);
+                Menu::set_current(main_menu);
                 update_time = st_get_ticks();
                 }
               else if (process_load_game_menu())