Moved TitleScreen::get_level_name() into GameManager, not a great place either, but...

diff --git a/src/supertux/game_manager.cpp b/src/supertux/game_manager.cpp
index ba5e72f..1d20184 100644 (file)
--- a/src/supertux/game_manager.cpp
+++ b/src/supertux/game_manager.cpp
@@ -19,6 +19,8 @@
 #include <sstream>
 
 #include "gui/menu_manager.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
 #include "supertux/game_session.hpp"
 #include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
@@ -65,4 +67,28 @@ GameManager::start_game(std::unique_ptr<World> world)
   }
 }
 
+std::string
+GameManager::get_level_name(const std::string& filename) const
+{
+  try
+  {
+    lisp::Parser parser;
+    const lisp::Lisp* root = parser.parse(filename);
+
+    const lisp::Lisp* level = root->get_lisp("supertux-level");
+    if(!level)
+      return "";
+
+    std::string name;
+    level->get("name", name);
+    return name;
+  }
+  catch(const std::exception& e)
+  {
+    log_warning << "Problem getting name of '" << filename << "': "
+                << e.what() << std::endl;
+    return "";
+  }
+}
+
 /* EOF */

diff --git a/src/supertux/game_manager.hpp b/src/supertux/game_manager.hpp
index 2e87896..f349032 100644 (file)
--- a/src/supertux/game_manager.hpp
+++ b/src/supertux/game_manager.hpp
@@ -35,6 +35,8 @@ public:
   void start_game(std::unique_ptr<World> world);
   void start_level(std::unique_ptr<World> world, int index);
 
+  std::string get_level_name(const std::string& levelfile) const;
+
 private:
   GameManager(const GameManager&) = delete;
   GameManager& operator=(const GameManager&) = delete;

diff --git a/src/supertux/menu/contrib_world_menu.cpp b/src/supertux/menu/contrib_world_menu.cpp
index c03c543..799e410 100644 (file)
--- a/src/supertux/menu/contrib_world_menu.cpp
+++ b/src/supertux/menu/contrib_world_menu.cpp
@@ -32,11 +32,11 @@ ContribWorldMenu::ContribWorldMenu(std::unique_ptr<World> world) :
   add_label(m_world->get_title());
   add_hl();
 
-  for (unsigned int i = 0; i < m_world->get_num_levels(); ++i)
+  for (int i = 0; i < m_world->get_num_levels(); ++i)
   {
     /** get level's title */
     std::string filename = m_world->get_level_filename(i);
-    std::string title = TitleScreen::get_level_name(filename);
+    std::string title = GameManager::current()->get_level_name(filename);
     add_entry(i, title);
   }
 

diff --git a/src/supertux/title_screen.cpp b/src/supertux/title_screen.cpp
index 62d810e..7b687b1 100644 (file)
--- a/src/supertux/title_screen.cpp
+++ b/src/supertux/title_screen.cpp
@@ -61,27 +61,6 @@ TitleScreen::TitleScreen(PlayerStatus* player_status) :
    );
 }
 
-std::string
-TitleScreen::get_level_name(const std::string& filename)
-{
-  try {
-    lisp::Parser parser;
-    const lisp::Lisp* root = parser.parse(filename);
-
-    const lisp::Lisp* level = root->get_lisp("supertux-level");
-    if(!level)
-      return "";
-
-    std::string name;
-    level->get("name", name);
-    return name;
-  } catch(std::exception& e) {
-    log_warning << "Problem getting name of '" << filename << "': "
-                << e.what() << std::endl;
-    return "";
-  }
-}
-
 void
 TitleScreen::make_tux_jump()
 {

diff --git a/src/supertux/title_screen.hpp b/src/supertux/title_screen.hpp
index 69354c1..a749791 100644 (file)
--- a/src/supertux/title_screen.hpp
+++ b/src/supertux/title_screen.hpp
@@ -34,9 +34,6 @@ class World;
 class TitleScreen : public Screen
 {
 public:
-  static std::string get_level_name(const std::string& levelfile);
-
-public:
   TitleScreen(PlayerStatus* player_status);
   virtual ~TitleScreen();