Replaced USE_ALPHA/IGNORE_ALPHA by booleans.

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 8be58de..730dbf7 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -247,9 +247,9 @@ void title(void)
   titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME);
 
   /* Load images: */
-  bkg_title = new Surface(datadir + "/images/background/arctis.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);
+  bkg_title = new Surface(datadir + "/images/background/arctis.jpg", false);
+  logo = new Surface(datadir + "/images/title/logo.png", true);
+  img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true);
 
   /* Generating contrib maps by only using a string_list */
   worldmap_list = dfiles("levels/worldmap", NULL, NULL);
@@ -257,7 +257,11 @@ void title(void)
   contrib_worldmap_menu->additem(MN_LABEL, _("Contrib Worlds"), 0,0);
   contrib_worldmap_menu->additem(MN_HL, "", 0,0);
   for(int i = 0; i < worldmap_list.num_items; i++)
-    contrib_worldmap_menu->additem(MN_ACTION, worldmap_list.item[i],0,0,i);
+    {
+    WorldMapNS::WorldMap worldmap;
+    worldmap.loadmap(worldmap_list.item[i]);
+    contrib_worldmap_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0,i);
+    }
   contrib_worldmap_menu->additem(MN_HL,"",0,0);
   contrib_worldmap_menu->additem(MN_BACK,"Back",0,0);
 
@@ -341,7 +345,7 @@ void title(void)
                   update_time = st_get_ticks();
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
+                  display_text_file("CREDITS", SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU: