Fixed a Segmentation Fault when mr_iceblock was kicked into a brick containing coins...

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

diff --git a/src/supertux/game_manager.hpp b/src/supertux/game_manager.hpp
index 5e21f88..7a66b0e 100644 (file)
--- a/src/supertux/game_manager.hpp
+++ b/src/supertux/game_manager.hpp
@@ -19,7 +19,7 @@
 
 #include <memory>
 
-#include "supertux/world_state.hpp"
+#include "supertux/savegame.hpp"
 #include "util/currenton.hpp"
 
 class World;
@@ -28,14 +28,14 @@ class GameManager : public Currenton<GameManager>
 {
 private:
   std::unique_ptr<World> m_world;
-  std::unique_ptr<WorldState> m_world_state;
+  std::unique_ptr<Savegame> m_savegame;
 
 public:
   GameManager();
   ~GameManager();
 
-  void start_game(std::unique_ptr<World> world);
-  void start_level(const std::string& level_filename);
+  void start_worldmap(std::unique_ptr<World> world);
+  void start_level(std::unique_ptr<World> world, const std::string& level_filename);
 
   std::string get_level_name(const std::string& levelfile) const;