Prevent "Return to Level Editor" from working, if no levelsubset is loaded. This...

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index d0c391a..ab172b6 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();
@@ -172,31 +172,6 @@ void draw_demo(GameSession* session, double frame_ratio)
 
   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);
   
@@ -291,7 +266,6 @@ void title(void)
         }
 
       /* Draw the background: */
-      draw_background();
       draw_demo(&session, frame_ratio);
       
       if (Menu::current() == main_menu)
@@ -325,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: