projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added conversion from and to Vector to Sizef
[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 <memory>
-#include "supertux/
world_stat
e.hpp"
+#include "supertux/
savegam
e.hpp"
#include "util/currenton.hpp"
class World;
#include "util/currenton.hpp"
class World;
@@
-28,14
+28,14
@@
class GameManager : public Currenton<GameManager>
{
private:
std::unique_ptr<World> m_world;
{
private:
std::unique_ptr<World> m_world;
- std::unique_ptr<
WorldState> m_world_stat
e;
+ std::unique_ptr<
Savegame> m_savegam
e;
public:
GameManager();
~GameManager();
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;
std::string get_level_name(const std::string& levelfile) const;