Pause music when pressing ESC during a level and resume it when exiting the pause...

[supertux.git] / src / supertux / game_manager.cpp

diff --git a/src/supertux/game_manager.cpp b/src/supertux/game_manager.cpp
index 3b615f1..1692a84 100644 (file)
--- a/src/supertux/game_manager.cpp
+++ b/src/supertux/game_manager.cpp
@@ -1,5 +1,5 @@
 //  SuperTux
-//  Copyright (C) 2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2013 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
@@ -19,18 +19,24 @@
 #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"
+#include "supertux/levelset_screen.hpp"
+#include "supertux/savegame.hpp"
 #include "supertux/screen.hpp"
 #include "supertux/screen_fade.hpp"
 #include "supertux/screen_manager.hpp"
 #include "supertux/world.hpp"
 #include "util/file_system.hpp"
 #include "util/log.hpp"
+#include "worldmap/worldmap.hpp"
 
 GameManager::GameManager() :
-  m_world()
+  m_world(),
+  m_savegame()
 {
 }
 
@@ -39,33 +45,30 @@ GameManager::~GameManager()
 }
 
 void
-GameManager::start_level(std::unique_ptr<World> world, int index)
+GameManager::start_level(std::unique_ptr<World> world, const std::string& level_filename)
 {
   m_world = std::move(world);
+  m_savegame.reset(new Savegame(m_world->get_savegame_filename()));
+  m_savegame->load();
 
-  std::unique_ptr<Screen> screen(new GameSession(m_world->get_level_filename(index), 
-                                                 m_world->get_player_status()));
-  g_screen_manager->push_screen(std::move(screen));
+  std::unique_ptr<Screen> screen(new LevelsetScreen(m_world->get_basedir(),
+                                                    level_filename,
+                                                    *m_savegame));
+  ScreenManager::current()->push_screen(std::move(screen));
 }
 
 void
-GameManager::start_game(std::unique_ptr<World> world)
+GameManager::start_worldmap(std::unique_ptr<World> world)
 {
-  m_world = std::move(world);
-
-  MenuManager::instance().clear_menu_stack();
-
-  std::string basename = m_world->get_basedir();
-  basename = basename.substr(0, basename.length()-1);
-  std::string worlddirname = FileSystem::basename(basename);
-  std::ostringstream stream;
-  stream << "profile" << g_config->profile << "/" << worlddirname << ".stsg";
-  std::string slotfile = stream.str();
-
   try
   {
-    m_world->set_savegame_filename(slotfile);
-    m_world->run();
+    m_world = std::move(world);
+    m_savegame.reset(new Savegame(m_world->get_savegame_filename()));
+    m_savegame->load();
+
+    ScreenManager::current()->push_screen(std::unique_ptr<Screen>(
+                                    new worldmap::WorldMap(m_world->get_worldmap_filename(),
+                                                           *m_savegame)));
   }
   catch(std::exception& e)
   {
@@ -73,4 +76,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 */