* "Outsourced" cheats from GameSession to scripting system.

[supertux.git] / src / game_session.hpp

diff --git a/src/game_session.hpp b/src/game_session.hpp
index 57edaa4..e41eb1e 100644 (file)
--- a/src/game_session.hpp
+++ b/src/game_session.hpp
@@ -1,9 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2004 Bill Kendrick <bill@newbreedsoftware.com>
-//                     Tobias Glaesser <tobi.web@gmx.de>
-//                     Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -14,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -28,6 +26,7 @@
 #include "statistics.hpp"
 #include "math/vector.hpp"
 #include "console.hpp"
+#include "video/surface.hpp"
 
 /* GameLoop modes */
 enum GameSessionMode {
@@ -55,7 +54,7 @@ class CodeController;
  * The GameSession class controlls the controll flow of the Game (the part
  * where you actually play a level)
  */
-class GameSession : public Screen, public ConsoleCommandReceiver
+class GameSession : public Screen
 {
 public:
   GameSession(const std::string& levelfile, GameSessionMode mode,
@@ -86,7 +85,7 @@ public:
   { return currentsector; }
 
   Level* get_current_level()
-  { return level; }
+  { return level.get(); }
 
   void start_sequence(const std::string& sequencename);
 
@@ -95,11 +94,9 @@ public:
    * resources for the current level/world
    */
   std::string get_working_directory();
-  bool consoleCommand(std::string command); /**< callback from Console; return false if command was unknown, true otherwise */
-
-private:
   void restart_level(bool fromBeginning = true);
 
+private:
   void check_end_conditions();
   void process_events();
   void capture_demo_step();
@@ -112,7 +109,9 @@ private:
   void process_menu();
 
   Timer endsequence_timer;
-  Level* level;
+  std::auto_ptr<Level> level;
+  std::auto_ptr<Surface> statistics_backdrop;
+
   Sector* currentsector;
 
   GameSessionMode mode;
@@ -151,7 +150,6 @@ private:
   std::string capture_file;
   std::istream* playback_demo_stream;
   CodeController* demo_controller;
-  Console* console;
 };
 
 #endif /*SUPERTUX_GAMELOOP_H*/