TODO update

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 4064e97..a2046d2 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -62,22 +62,33 @@ static int frame;
 static unsigned int last_update_time;
 static unsigned int update_time;
 
-std::vector<st_subset> contrib_subsets;
+std::vector<LevelSubset*> contrib_subsets;
 std::string current_contrib_subset;
 
+void free_contrib_menu()
+{
+  for(std::vector<LevelSubset*>::iterator i = contrib_subsets.begin();
+      i != contrib_subsets.end(); ++i)
+    delete *i;
+
+  contrib_subsets.clear();
+  contrib_menu->clear();
+}
+
 void generate_contrib_menu()
 {
   string_list_type level_subsets = dsubdirs("/levels", "info");
 
-  contrib_menu->clear();
+  free_contrib_menu();
+
   contrib_menu->additem(MN_LABEL,"Contrib Levels",0,0);
   contrib_menu->additem(MN_HL,"",0,0);
 
   for (int i = 0; i < level_subsets.num_items; ++i)
     {
-      st_subset subset;
-      subset.load(level_subsets.item[i]);
-      contrib_menu->additem(MN_GOTO, subset.title.c_str(), i,
+      LevelSubset* subset = new LevelSubset();
+      subset->load(level_subsets.item[i]);
+      contrib_menu->additem(MN_GOTO, subset->title.c_str(), i,
           contrib_subset_menu, i+1);
       contrib_subsets.push_back(subset);
     }
@@ -102,7 +113,7 @@ void check_contrib_menu()
             {
               current_subset = index;
               // FIXME: This shouln't be busy looping
-              st_subset& subset = contrib_subsets[index];
+              LevelSubset& subset = * (contrib_subsets[index]);
           
               current_contrib_subset = subset.name;
 
@@ -139,6 +150,7 @@ void check_contrib_subset_menu()
           std::cout << "Sarting level: " << index << std::endl;
           GameSession session(current_contrib_subset, index, ST_GL_PLAY);
           session.run();
+          player_status.reset();
           Menu::set_current(main_menu);
         }
     }  
@@ -200,7 +212,7 @@ void draw_demo(GameSession* session, double frame_ratio)
       random_timer.start(rand() % 3000 + 3000);
       walking = !walking;
     }
-  
+
   // Wrap around at the end of the level back to the beginnig
   if(plevel->width * 32 - 320 < tux->base.x)
     {
@@ -208,13 +220,17 @@ void draw_demo(GameSession* session, double frame_ratio)
       scroll_x = tux->base.x - 320;
     }
 
+  tux->can_jump = true;
   float last_tux_x_pos = tux->base.x;
   tux->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
   // stuck behind a wall
   if (last_tux_x_pos == tux->base.x)
-    walking = false;
+    {
+      walking = false;
+    }
 
   tux->draw();
 }
@@ -222,7 +238,6 @@ void draw_demo(GameSession* session, double frame_ratio)
 /* --- TITLE SCREEN --- */
 void title(void)
 {
-  st_subset subset;
   random_timer.init(true);
 
   walking = true;
@@ -313,7 +328,7 @@ void title(void)
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_title);
+                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:
@@ -327,7 +342,25 @@ void title(void)
             }
           else if(menu == load_game_menu)
             {
-              if (process_load_game_menu())
+              if(event.key.keysym.sym == SDLK_DELETE)
+                {
+                int slot = menu->get_active_item_id();
+                char str[1024];
+                sprintf(str,"Are you sure you want to delete slot %d?", slot);
+                
+                draw_background();
+
+                if(confirm_dialog(str))
+                  {
+                  sprintf(str,"%s/slot%d.stsg", st_save_dir, slot);
+                  printf("Removing: %s\n",str);
+                  remove(str);
+                  }
+
+                update_load_save_game_menu(load_game_menu);
+                update_time = st_get_ticks();
+                }
+              else if (process_load_game_menu())
                 {
                   // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
                   // reset tux
@@ -360,8 +393,10 @@ void title(void)
     }
   /* Free surfaces: */
 
+  free_contrib_menu();
   delete bkg_title;
   delete logo;
+  delete img_choose_subset;
 }
 
 // EOF //