Make use of the arctic background instead of the Tux oil one.

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index a2046d2..daf82ff 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();
@@ -165,38 +165,13 @@ void draw_background()
 
 void draw_demo(GameSession* session, double frame_ratio)
 {
-  World::set_current(session->get_world());
-  //World* world  = session->get_world();
+  World* world  = session->get_world();
+  World::set_current(world);
   Level* plevel = session->get_level();
-  Player* tux = session->get_world()->get_tux();
+  Player* tux = world->get_tux();
 
-  session->get_world()->play_music(LEVEL_MUSIC);
+  world->play_music(LEVEL_MUSIC);
   
-  /* FIXME:
-  // update particle systems
-  std::vector<ParticleSystem*>::iterator p;
-  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-    {
-      (*p)->simulate(frame_ratio);
-    }
-
-  // Draw particle systems (background)
-  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-    {
-      (*p)->draw(scroll_x, 0, 0);
-    }
-  */
-
-  // Draw interactive tiles:
-  for (int y = 0; y < 15; ++y)
-    {
-      for (int x = 0; x < 21; ++x)
-        {
-          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
-                     plevel->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
-        }
-    }
-
   global_frame_counter++;
   tux->key_event((SDLKey) keymap.right,DOWN);
   
@@ -216,13 +191,14 @@ 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;
   float last_tux_x_pos = tux->base.x;
-  tux->action(frame_ratio);
+  world->action(frame_ratio);
+  
 
   // disabled for now, since with the new jump code we easily get deadlocks
   // Jump if tux stays in the same position for one loop, ie. if he is
@@ -232,7 +208,7 @@ void draw_demo(GameSession* session, double frame_ratio)
       walking = false;
     }
 
-  tux->draw();
+  world->draw();
 }
 
 /* --- TITLE SCREEN --- */
@@ -290,18 +266,17 @@ void title(void)
         }
 
       /* Draw the background: */
-      draw_background();
       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();
@@ -324,7 +299,7 @@ void title(void)
                   generate_contrib_menu();
                   break;
                 case MNID_LEVELEDITOR:
-                  leveleditor(1);
+                  leveleditor();
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
@@ -358,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())