Fixed crash when exiting level editor.
[supertux.git] / src / title.cpp
index 1e913df..fe63a48 100644 (file)
@@ -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;
@@ -72,10 +74,11 @@ static GameSession* titlesession;
 
 static std::vector<LevelSubset*> contrib_subsets;
 static LevelSubset* current_contrib_subset = 0;
+static int first_level_index;
 
 static std::set<std::string> worldmap_list;
 
-static LevelEditor* leveleditor;
+static FrameRate frame_rate(100);  
 
 void update_load_save_game_menu(Menu* pmenu)
 {
@@ -101,7 +104,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,28 +111,34 @@ 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);
-      contrib_subsets.push_back(subset);
-      ++i;
-    }
 
-  i = 0;
   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;
     }
 
   contrib_menu->additem(MN_HL,"",0,0);
+
+  first_level_index = i;
+  for (std::set<std::string>::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it)
+    {
+      LevelSubset* subset = new LevelSubset();
+      subset->load(*it);
+      if(subset->hide_from_contribs)
+        {
+        delete subset;
+        continue;
+        }
+      contrib_menu->additem(MN_GOTO, subset->title, 0, contrib_subset_menu, i);
+      contrib_subsets.push_back(subset);
+      ++i;
+    }
+
+  contrib_menu->additem(MN_HL,"",0,0);
   contrib_menu->additem(MN_BACK,_("Back"),0,0);
 
   level_subsets.clear();
@@ -144,21 +152,45 @@ void check_levels_contrib_menu()
   if (index == -1)
     return;
 
-  if (index < (int)contrib_subsets.size())
+  if((unsigned)index < worldmap_list.size())
+    {
+    WorldMapNS::WorldMap worldmap;
+    std::set<std::string>::iterator it = worldmap_list.begin();
+    for(int i = index; i > 0; --i)
+    ++it;
+
+    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);
+    }
+  else if (index < (int)contrib_subsets.size() + first_level_index)
     {
+    index -= first_level_index;
     if (current_subset != index)
       {
       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 +200,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);
@@ -184,17 +216,6 @@ void check_levels_contrib_menu()
       titlesession->set_current();
       }
     }
-  else if((unsigned)index < worldmap_list.size() + (int)contrib_subsets.size())
-    {
-    WorldMapNS::WorldMap worldmap;
-    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();
-
-    Menu::set_current(main_menu);
-    }
 }
 
 void check_contrib_subset_menu()
@@ -217,6 +238,20 @@ void check_contrib_subset_menu()
     }  
 }
 
+/* If the demo was stopped - because game started, level
+   editor was excuted, etc - call this when you get back
+   to the title code.
+ */
+void resume_demo()
+{
+  // FIXME: shouldn't be needed if GameSession
+  // didn't relay on global variables
+  titlesession->get_current_sector()->activate();
+  titlesession->set_current();
+
+  frame_rate.update();
+}
+
 void draw_demo(double frame_ratio)
 {
   Sector* world  = titlesession->get_current_sector();
@@ -244,6 +279,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;
@@ -265,10 +301,10 @@ void draw_demo(double frame_ratio)
 /* --- TITLE SCREEN --- */
 void title(void)
 {
-  random_timer.init(true);
-
   walking = true;
+  LevelEditor* leveleditor;
 
+  random_timer.init(true);
   Ticks::pause_init();
 
   titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME);
@@ -279,7 +315,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();
@@ -287,7 +323,6 @@ void title(void)
   /* --- Main title loop: --- */
   frame = 0;
 
-  FrameRate frame_rate(100);  
   frame_rate.set_frame_limit(false);
   
   random_timer.start(rand() % 2000 + 2000);
@@ -327,12 +362,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();
@@ -359,7 +394,7 @@ void title(void)
                   leveleditor->run();
                   delete leveleditor;
                   Menu::set_current(main_menu);
-                  frame_rate.update();
+                  resume_demo();
                   break;
                 case MNID_CREDITS:
                   display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
@@ -379,27 +414,24 @@ 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);
                 Menu::set_current(main_menu);
-                frame_rate.update();
+                resume_demo();
                 }
               else if (process_load_game_menu())
                 {
-                  // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
-                  titlesession->get_current_sector()->activate();
-                  titlesession->set_current();
-                  //titletux.level_begin();
-                  frame_rate.update();
+                  resume_demo();
                 }
             }
           else if(menu == contrib_menu)