Possible fix for expression that's always false

[supertux.git] / src / supertux / menu / contrib_menu.cpp

diff --git a/src/supertux/menu/contrib_menu.cpp b/src/supertux/menu/contrib_menu.cpp
index 34895b7..8bbc717 100644 (file)
--- a/src/supertux/menu/contrib_menu.cpp
+++ b/src/supertux/menu/contrib_menu.cpp
@@ -1,5 +1,5 @@
 //  SuperTux
-//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmail.com>
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -17,26 +17,36 @@
 #include "supertux/menu/contrib_menu.hpp"
 
 #include <physfs.h>
+#include <sstream>
 
+#include "gui/menu_item.hpp"
 #include "gui/menu_manager.hpp"
-#include "supertux/menu/contrib_world_menu.hpp"
+#include "supertux/game_manager.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/menu/contrib_levelset_menu.hpp"
+#include "supertux/menu/menu_storage.hpp"
 #include "supertux/title_screen.hpp"
 #include "supertux/world.hpp"
+#include "util/file_system.hpp"
 #include "util/gettext.hpp"
 
 ContribMenu::ContribMenu() :
-  m_contrib_world_menu(),
   m_contrib_worlds()
 {
-  /** Generating contrib levels list by making use of Level Subset  */
+  // Generating contrib levels list by making use of Level Subset
   std::vector<std::string> level_worlds;
-  char** files = PHYSFS_enumerateFiles("levels/");
-  for(const char* const* filename = files; *filename != 0; ++filename) {
-    std::string filepath = std::string("levels/") + *filename;
+
+  std::unique_ptr<char*, decltype(&PHYSFS_freeList)>
+    files(PHYSFS_enumerateFiles("levels"),
+          PHYSFS_freeList);
+  for(const char* const* filename = files.get(); *filename != 0; ++filename)
+  {
+    std::string filepath = FileSystem::join("levels", *filename);
     if(PHYSFS_isDirectory(filepath.c_str()))
+    {
       level_worlds.push_back(filepath);
+    }
   }
-  PHYSFS_freeList(files);
 
   add_label(_("Contrib Levels"));
   add_hl();
@@ -46,12 +56,73 @@ ContribMenu::ContribMenu() :
   {
     try
     {
-      std::auto_ptr<World> world (new World());
-      world->load(*it + "/info");
-      if (!world->hide_from_contribs) 
+      std::unique_ptr<World> world = World::load(*it);
+
+      if (!world->hide_from_contribs())
       {
-        add_entry(i++, world->get_title());
-        m_contrib_worlds.push_back(world.release());
+        Savegame savegame(world->get_savegame_filename());
+        savegame.load();
+
+        if (world->is_levelset())
+        {
+          int level_count = 0;
+          int solved_count = 0;
+
+          const auto& state = savegame.get_levelset_state(world->get_basedir());
+          for(const auto& level_state : state.level_states)
+          {
+            if (level_state.solved)
+            {
+              solved_count += 1;
+            }
+            level_count += 1;
+          }
+
+          std::ostringstream title;
+          title << "[" << world->get_title() << "]";
+          if (level_count == 0)
+          {
+            title << " *NEW*";
+          }
+          else
+          {
+            title << " (" << solved_count << "/" << level_count << ")";
+          }
+          add_entry(i++, title.str());
+          m_contrib_worlds.push_back(std::move(world));
+        }
+        else if (world->is_worldmap())
+        {
+          int level_count = 0;
+          int solved_count = 0;
+
+          const auto& state = savegame.get_worldmap_state(world->get_worldmap_filename());
+          for(const auto& level_state : state.level_states)
+          {
+            if (level_state.solved)
+            {
+              solved_count += 1;
+            }
+            level_count += 1;
+          }
+
+          std::ostringstream title;
+          title << world->get_title();
+          if (level_count == 0)
+          {
+            title << " *NEW*";
+          }
+          else
+          {
+            title << " (" << solved_count << "/" << level_count << ")";
+          }
+          add_entry(i++, title.str());
+          m_contrib_worlds.push_back(std::move(world));
+        }
+        else
+        {
+          log_warning << "unknown World type" << std::endl;
+        }
       }
     }
     catch(std::exception& e)
@@ -66,29 +137,24 @@ ContribMenu::ContribMenu() :
 
 ContribMenu::~ContribMenu()
 {
-  for(std::vector<World*>::iterator i = m_contrib_worlds.begin(); i != m_contrib_worlds.end(); ++i)
-  {
-    delete *i;
-  }
-  m_contrib_worlds.clear();
 }
 
 void
-ContribMenu::check_menu()
+ContribMenu::menu_action(MenuItem* item)
 {
-  int index = check();
+  int index = item->id;
   if (index != -1)
   {
-    World* world = m_contrib_worlds[index];
-    
-    if (!world->is_levelset) 
+    // reload the World so that we have something that we can safely
+    // std::move() around without wreaking the ContribMenu
+    std::unique_ptr<World> world = World::load(m_contrib_worlds[index]->get_basedir());
+    if (!world->is_levelset())
     {
-      TitleScreen::start_game(world);
+      GameManager::current()->start_worldmap(std::move(world));
     }
-    else 
+    else
     {
-      m_contrib_world_menu.reset(new ContribWorldMenu(*world));
-      MenuManager::push_current(m_contrib_world_menu.get());
+      MenuManager::instance().push_menu(std::unique_ptr<Menu>(new ContribLevelsetMenu(std::move(world))));
     }
   }
 }