projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New powerups added to cheat menu
[supertux.git]
/
src
/
supertux
/
title_screen.hpp
diff --git
a/src/supertux/title_screen.hpp
b/src/supertux/title_screen.hpp
index
19c66ad
..
65f68ea
100644
(file)
--- a/
src/supertux/title_screen.hpp
+++ b/
src/supertux/title_screen.hpp
@@
-24,9
+24,10
@@
class AddonMenu;
class CodeController;
class ContribMenu;
class ContribWorldMenu;
class CodeController;
class ContribMenu;
class ContribWorldMenu;
-class MainMenu;
class Menu;
class Menu;
+class PlayerStatus;
class World;
class World;
+class Savegame;
/**
* Screen that displays the SuperTux logo, lets players start a new game, etc.
/**
* Screen that displays the SuperTux logo, lets players start a new game, etc.
@@
-34,10
+35,7
@@
class World;
class TitleScreen : public Screen
{
public:
class TitleScreen : public Screen
{
public:
- static std::string get_level_name(const std::string& levelfile);
-
-public:
- TitleScreen();
+ TitleScreen(Savegame& savegame);
virtual ~TitleScreen();
virtual void setup();
virtual ~TitleScreen();
virtual void setup();
@@
-47,18
+45,14
@@
public:
virtual void update(float elapsed_time);
virtual void update(float elapsed_time);
-public:
- static void start_game(World* world);
-
private:
void make_tux_jump();
private:
void make_tux_jump();
- void generate_main_menu();
-
+
private:
private:
- std::auto_ptr<MainMenu> main_menu;
SurfacePtr frame;
SurfacePtr frame;
- std::auto_ptr<CodeController> controller;
- std::auto_ptr<GameSession> titlesession;
+ std::unique_ptr<CodeController> controller;
+ std::unique_ptr<GameSession> titlesession;
+ std::string copyright_text;
private:
TitleScreen(const TitleScreen&);
private:
TitleScreen(const TitleScreen&);