<MatzeB> my patch fixes another leak in the levelsubset code and cleans that up a...

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 8ac8771..d3416c5 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -62,24 +62,33 @@ static int frame;
 static unsigned int last_update_time;
 static unsigned int update_time;
 
-void display_text_file(char *filename);
-
-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);
     }
@@ -104,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;
 
@@ -224,7 +233,6 @@ void draw_demo(GameSession* session, double frame_ratio)
 /* --- TITLE SCREEN --- */
 void title(void)
 {
-  st_subset subset;
   random_timer.init(true);
 
   walking = true;
@@ -315,7 +323,7 @@ void title(void)
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS");
+                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:
@@ -362,148 +370,11 @@ void title(void)
     }
   /* Free surfaces: */
 
+  free_contrib_menu();
   delete bkg_title;
   delete logo;
+  delete img_choose_subset;
 }
 
-#define MAX_VEL 10
-#define SPEED   1
-#define SCROLL  60
-#define ITEMS_SPACE 4
-
-void display_text_file(char *file)
-{
-  int done;
-  int scroll, speed;
-  int y;
-  Timer timer;
-  int length;
-  FILE* fi;
-  char temp[1024];
-  string_list_type names;
-  char filename[1024];
-  string_list_init(&names);
-  sprintf(filename,"%s/%s", datadir.c_str(), file);
-  if((fi = fopen(filename,"r")) != NULL)
-    {
-      while(fgets(temp, sizeof(temp), fi) != NULL)
-        {
-          temp[strlen(temp)-1]='\0';
-          string_list_add_item(&names,temp);
-        }
-      fclose(fi);
-    }
-  else
-    {
-      string_list_add_item(&names,"Credits were not found!");
-      string_list_add_item(&names,"Shame on the guy, who");
-      string_list_add_item(&names,"forgot to include them");
-      string_list_add_item(&names,"in your SuperTux distribution.");
-    }
-
-
-  timer.init(SDL_GetTicks());
-  timer.start(50);
-
-  scroll = 0;
-  speed = 2;
-  done = 0;
-
-  length = names.num_items;
+// EOF //
 
-  SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
-
-  while(done == 0)
-    {
-      /* in case of input, exit */
-      SDL_Event event;
-      while(SDL_PollEvent(&event))
-        switch(event.type)
-          {
-          case SDL_KEYDOWN:
-            switch(event.key.keysym.sym)
-              {
-              case SDLK_UP:
-                speed -= SPEED;
-                break;
-              case SDLK_DOWN:
-                speed += SPEED;
-                break;
-              case SDLK_SPACE:
-              case SDLK_RETURN:
-                if(speed >= 0)
-                  scroll += SCROLL;
-                break;
-              case SDLK_ESCAPE:
-                done = 1;
-                break;
-              default:
-                break;
-              }
-            break;
-          case SDL_QUIT:
-            done = 1;
-            break;
-          default:
-            break;
-          }
-
-      if(speed > MAX_VEL)
-        speed = MAX_VEL;
-      else if(speed < -MAX_VEL)
-        speed = -MAX_VEL;
-
-      /* draw the credits */
-
-      draw_background();
-
-      if (strcmp(file, "CREDITS") == 0)
-        white_big_text->drawf("- SuperTux " VERSION " -", 
-                              0, screen->h-scroll, A_HMIDDLE, A_TOP, 2);
-
-      y = 0;
-      for(int i = 0; i < length; i++)
-        {
-        switch(names.item[i][0])
-          {
-          case ' ':
-            white_small_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
-            y += white_small_text->h+ITEMS_SPACE;
-            break;
-          case '       ':
-            white_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
-            y += white_text->h+ITEMS_SPACE;
-            break;
-          case '-':
-            white_big_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 3);
-            y += white_big_text->h+ITEMS_SPACE;
-            break;
-          default:
-            blue_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
-            y += blue_text->h+ITEMS_SPACE;
-            break;
-          }
-        }
-
-      flipscreen();
-
-      if(60+screen->h+y-scroll < 0 && 20+60+screen->h+y-scroll < 0)
-        done = 1;
-
-      scroll += speed;
-      if(scroll < 0)
-        scroll = 0;
-
-      SDL_Delay(35);
-
-      if(timer.get_left() < 0)
-        {
-          frame++;
-          timer.start(50);
-        }
-    }
-  string_list_free(&names);
-
-  SDL_EnableKeyRepeat(0, 0);    // disables key repeating
-  Menu::set_current(main_menu);
-}