[Super-tux-commit] supertux/src title.cpp,1.102,1.103 worldmap.h,1.34,1.35

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3426/src

Modified Files:
	title.cpp worldmap.h 
Log Message:
Shows map's title, not filename, in menu.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- title.cpp	9 Jul 2004 14:43:44 -0000	1.102
+++ title.cpp	9 Jul 2004 18:18:11 -0000	1.103
@@ -257,7 +257,11 @@
   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);
 

Index: worldmap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- worldmap.h	9 Jul 2004 14:43:44 -0000	1.34
+++ worldmap.h	9 Jul 2004 18:18:11 -0000	1.35
@@ -199,6 +199,9 @@
   /* Load map directly from file */
   void loadmap(const std::string& filename);
 
+  const std::string& get_world_title() const
+    { return name; }
+
 private:
   void on_escape_press();
 };