Bugfix: its finally possible to open a levelsubset.

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 1e913df..b948c59 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -20,6 +20,7 @@
 //  02111-1307, USA.
 
 #include <iostream>
+#include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -58,6 +59,7 @@
 #include "special/base.h"
 #include "app/gettext.h"
 #include "misc.h"
+#include "camera.h"
 
 static Surface* bkg_title;
 static Surface* logo;
@@ -101,7 +103,6 @@ void free_contrib_menu()
 
 void generate_contrib_menu()
 {
-  
   /** Generating contrib levels list by making use of Level Subset */
   std::set<std::string> level_subsets = FileSystem::dsubdirs("/levels", "info");
 
@@ -109,24 +110,22 @@ void generate_contrib_menu()
 
   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);
+      subset->load(*it);
+      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;
     }
 
@@ -151,14 +150,14 @@ void check_levels_contrib_menu()
       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 */
@@ -168,7 +167,7 @@ void check_levels_contrib_menu()
         if(!reader)
           {
           std::cerr << "Error: Could not open level file. Ignoring...\n";
-          return;
+          continue;
           }
 
         reader->read_string("name", level_title, true);
@@ -190,8 +189,20 @@ void check_levels_contrib_menu()
     std::set<std::string>::iterator it = worldmap_list.begin();
     for(int i = index - contrib_subsets.size(); i > 0; --i)
     ++it;
-    worldmap.loadmap((*it));
-    worldmap.display();
+
+    std::string map_filename = *it;
+
+    worldmap.set_map_filename(map_filename);
+
+    // hack to erase the extension
+    unsigned int ext_pos = it->find_last_of(".");
+    if(ext_pos != std::string::npos)
+      map_filename.erase(ext_pos, map_filename.size() - ext_pos);
+
+    // TODO: slots should be available for contrib maps
+    worldmap.loadgame(st_save_dir + "/" + map_filename + "-slot1.stsg");
+
+    worldmap.display();  // run the map
 
     Menu::set_current(main_menu);
     }
@@ -244,6 +255,7 @@ void draw_demo(double frame_ratio)
   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;
@@ -279,7 +291,7 @@ void title(void)
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true);
 
   /* Generating contrib maps by only using a string_list */
-  worldmap_list = FileSystem::dfiles("levels/worldmap", NULL, "icyisland.stwm");
+  worldmap_list = FileSystem::dfiles("levels/worldmap", "", "icyisland.stwm");
 
   titlesession->get_current_sector()->activate();
   titlesession->set_current();
@@ -327,12 +339,12 @@ void title(void)
         context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30),
             LAYER_FOREGROUND1+1);
 
-      context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LAYER_FOREGROUND1);
+      context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LEFT_ALLIGN, LAYER_FOREGROUND1);
       context.draw_text(white_small_text,
         _("Copyright (c) 2003 SuperTux Devel Team\n"
           "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
           "are welcome to redistribute it under certain conditions; see the file COPYING\n"
-          "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LAYER_FOREGROUND1);
+          "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LEFT_ALLIGN, LAYER_FOREGROUND1);
 
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
@@ -379,14 +391,15 @@ void title(void)
               if(event.key.keysym.sym == SDLK_DELETE)
                 {
                 int slot = menu->get_active_item_id();
-                char str[1024];
-                sprintf(str,_("Are you sure you want to delete slot %d?"), slot);
+                std::stringstream stream;
+                stream << slot;
+                std::string str = _("Are you sure you want to delete slot") + stream.str() + "?";
                 
-                if(confirm_dialog(bkg_title, str))
+                if(confirm_dialog(bkg_title, str.c_str()))
                   {
-                  sprintf(str,"%s/slot%d.stsg", st_save_dir, slot);
-                  printf("Removing: %s\n",str);
-                  remove(str);
+                  str = st_save_dir + "/slot" + stream.str() + ".stsg";
+                  printf("Removing: %s\n",str.c_str());
+                  remove(str.c_str());
                   }
 
                 update_load_save_game_menu(load_game_menu);