X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=01dacb0b6aed59090f6f263f408563307ce8f132;hb=9e082fc66762cb43a25955a971082a0a5aab0840;hp=60eaa4ef1f529599ad7745d89dd12c16fe5c75a2;hpb=35c470be75fe9c80ae2f54ec8fe1b062f4df76b1;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index 60eaa4ef1..01dacb0b6 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -42,9 +42,9 @@
 #include "tile.h"
 #include "resources.h"
 
-static texture_type bkg_title;
-static texture_type logo;
-static texture_type img_choose_subset;
+static Surface* bkg_title;
+static Surface* logo;
+static Surface* img_choose_subset;
 
 static bool walking;
 static Timer random_timer;
@@ -76,8 +76,8 @@ void update_contrib_menu()
       for (int i = 0; i < level_subsets.num_items; ++i)
         {
           st_subset subset;
-          subset.load(level_subsets.item[0]);
-          contrib_menu->additem(MN_GOTO, subset.title.c_str(), 0, contrib_subset_menu);
+          subset.load(level_subsets.item[i]);
+          contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, contrib_subset_menu);
           contrib_subsets.push_back(subset);
         }
 
@@ -149,7 +149,7 @@ void draw_background()
 {
   /* Draw the title background: */
 
-  texture_draw_bg(&bkg_title);
+  bkg_title->draw_bg();
 }
 
 void draw_demo(GameSession* session, double frame_ratio)
@@ -243,9 +243,9 @@ bool title(void)
 
   /* Load images: */
 
-  texture_load(&bkg_title,datadir + "/images/title/background.jpg", IGNORE_ALPHA);
-  texture_load(&logo,datadir + "/images/title/logo.png", USE_ALPHA);
-  texture_load(&img_choose_subset,datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
+  bkg_title = new Surface(datadir + "/images/title/background.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);
 
   /* --- Main title loop: --- */
   bool done = 0;
@@ -253,7 +253,7 @@ bool title(void)
   frame = 0;
 
   /* Draw the title background: */
-  texture_draw_bg(&bkg_title);
+  bkg_title->draw_bg();
   load_hs();
 
   update_time = st_get_ticks();
@@ -298,9 +298,9 @@ bool title(void)
       draw_demo(&session, frame_ratio);
       
       if (current_menu == main_menu)
-        texture_draw(&logo, 160, 30);
+        logo->draw( 160, 30);
 
-      text_draw(&white_small_text, 
+      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"
@@ -338,16 +338,16 @@ bool title(void)
                   subset.load(level_subsets.item[0]);
                   while(!done)
                     {
-                      texture_draw(&img_choose_subset,(screen->w - img_choose_subset.w) / 2, 0);
+                      img_choose_subset->draw((screen->w - img_choose_subset.w) / 2, 0);
                       if(level_subsets.num_items != 0)
                         {
-                          texture_draw(&subset.image,(screen->w - subset.image.w) / 2 + 25,78);
+                          subset.image->draw((screen->w - subset.image.w) / 2 + 25,78);
                           if(level_subsets.num_items > 1)
                             {
                               if(i > 0)
-                                texture_draw(&arrow_left,(screen->w / 2) - ((subset.title.length()+2)*16)/2,20);
+                                arrow_left->draw((screen->w / 2) - ((subset.title.length()+2)*16)/2,20);
                               if(i < level_subsets.num_items-1)
-                                texture_draw(&arrow_right,(screen->w / 2) + ((subset.description.length())*16)/2,20);
+                                arrow_right->draw((screen->w / 2) + ((subset.description.length())*16)/2,20);
                             }
                           text_drawf(&gold_text, subset.title.c_str(), 0, 20, A_HMIDDLE, A_TOP, 1);
                           text_drawf(&gold_text, subset.description.c_str(), 20, -20, A_HMIDDLE, A_BOTTOM, 1);
@@ -468,8 +468,8 @@ bool title(void)
     }
   /* Free surfaces: */
 
-  texture_free(&bkg_title);
-  texture_free(&logo);
+  delete bkg_title;
+  delete logo;
   
   /* Return to main! */
   return done;
@@ -566,7 +566,7 @@ void display_credits()
 
       draw_background();
 
-      text_drawf(&white_big_text, "- Credits -", 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2);
+      white_big_text->drawf("- Credits -", 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2);
 
       for(i = 0, n = 0, d = 0; i < length; i++,n++,d++)
         {
@@ -575,13 +575,13 @@ void display_credits()
           else
             {
               if(names.item[i][0] == ' ')
-                text_drawf(&white_small_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll-10, A_HMIDDLE, A_TOP, 1);
+                white_small_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll-10, A_HMIDDLE, A_TOP, 1);
               else if(names.item[i][0] == '	')
-                text_drawf(&white_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1);
+                white_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1);
               else if(names.item[i+1][0] == '-' || names.item[i][0] == '-')
-                text_drawf(&white_big_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 3);
+                white_big_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 3);
               else
-                text_drawf(&blue_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1);
+                blue_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1);
             }
         }