[Super-tux-commit] supertux/src title.cpp,1.117,1.118

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

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

Modified Files:
	title.cpp 
Log Message:
Fixed levels on contribs menu.
Fixed warpping when Tux gets end of level on the demo background in title.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- title.cpp	16 Sep 2004 15:04:17 -0000	1.117
+++ title.cpp	17 Sep 2004 18:55:03 -0000	1.118
@@ -59,6 +59,7 @@
 #include "special/base.h"
 #include "app/gettext.h"
 #include "misc.h"
+#include "camera.h"
 
 static Surface* bkg_title;
 static Surface* logo;
@@ -102,7 +103,6 @@
 
 void generate_contrib_menu()
 {
-  
   /** Generating contrib levels list by making use of Level Subset */
   std::set<std::string> level_subsets = FileSystem::dsubdirs("/levels", "info");
 
@@ -110,24 +110,22 @@
 
   contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0);
   contrib_menu->additem(MN_HL,"",0,0);
-  
   int i = 0;
   for (std::set<std::string>::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it)
     {
       LevelSubset* subset = new LevelSubset();
       subset->load((*it).c_str());
-      contrib_menu->additem(MN_GOTO, subset->title.c_str(), i,
-          contrib_subset_menu);
+      contrib_menu->additem(MN_GOTO, subset->title, 0, contrib_subset_menu, i);
       contrib_subsets.push_back(subset);
       ++i;
     }
 
-  i = 0;
+  i = level_subsets.size();
   for(std::set<std::string>::iterator it = worldmap_list.begin(); it != worldmap_list.end(); ++it)
     {
     WorldMapNS::WorldMap worldmap;
     worldmap.loadmap((*it).c_str());
-    contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i + level_subsets.size());
+    contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i);
     ++i;
     }
 
@@ -152,14 +150,14 @@
       current_subset = index;
       // FIXME: This shouln't be busy looping
       LevelSubset& subset = * (contrib_subsets[index]);
-          
+
       current_contrib_subset = &subset;
 
       contrib_subset_menu->clear();
 
       contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0);
       contrib_subset_menu->additem(MN_HL,"",0,0);
-              
+
       for (int i = 0; i < subset.get_num_levels(); ++i)
         {
         /** get level's title */
@@ -245,6 +243,7 @@
   if(world->solids->get_width() * 32 - 320 < tux->base.x)
     {
       tux->level_begin();
+      world->camera->reset(Vector(tux->base.x, tux->base.y));
     }
 
   tux->can_jump = true;