X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.hpp;h=b9e1ff134932050f8d0ae12488643483bf657a9a;hb=9a1687312904d32d5aa53851a24d643c7def02ff;hp=6b72450826f81bd5c824ae13bcc2e2f71887e746;hpb=cfa6a410943ae4fee8d5d8c5270f7119a82fe970;p=supertux.git

diff --git a/src/game_session.hpp b/src/game_session.hpp
index 6b7245082..b9e1ff134 100644
--- 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.
@@ -30,37 +28,21 @@
 #include "console.hpp"
 #include "video/surface.hpp"
 
-/* GameLoop modes */
-enum GameSessionMode {
-  ST_GL_PLAY,
-  ST_GL_TEST,
-  ST_GL_LOAD_GAME,
-  ST_GL_LOAD_LEVEL_FILE,
-  ST_GL_DEMO_GAME
-};
-
-enum GameMenuIDs {
-  MNID_CONTINUE,
-  MNID_ABORTLEVEL
-};
-
-extern int game_started;
-
 class Level;
 class Sector;
 class Statistics;
 class DrawingContext;
 class CodeController;
+class Menu;
 
 /**
  * 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,
-              Statistics* statistics = NULL);
+  GameSession(const std::string& levelfile, Statistics* statistics = NULL);
   ~GameSession();
 
   void record_demo(const std::string& filename);
@@ -77,30 +59,27 @@ public:
 
   /// ends the current level
   void finish(bool win = true);
-  void respawn(const std::string& sectorname,
-      const std::string& spawnpointname);
-  void set_reset_point(const std::string& sectorname,
-      const Vector& pos);
+  void respawn(const std::string& sectorname, const std::string& spawnpointname);
+  void set_reset_point(const std::string& sectorname, const Vector& pos);
   void display_info_box(const std::string& text);
   
   Sector* get_current_sector()
   { return currentsector; }
 
   Level* get_current_level()
-  { return level; }
+  { return level.get(); }
 
   void start_sequence(const std::string& sequencename);
 
-  /** returns the "working directory" usually this is the directory where the
+  /**
+   * returns the "working directory" usually this is the directory where the
    * currently played level resides. This is used when locating additional
    * resources for the current level/world
    */
   std::string get_working_directory();
-  bool consoleCommand(std::string command, std::vector<std::string> arguments); /**< 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();
@@ -113,14 +92,12 @@ private:
   void process_menu();
 
   Timer endsequence_timer;
-  Level* level;
-  Surface* statistics_backdrop; // FIXME: where to put this?
+  std::auto_ptr<Level> level;
+  std::auto_ptr<Surface> statistics_backdrop;
 
   Sector* currentsector;
 
-  GameSessionMode mode;
   int levelnb;
-  float fps_fps;
   int pause_menu_frame;
 
   /** If true the end_sequence will be played, user input will be
@@ -154,7 +131,10 @@ private:
   std::string capture_file;
   std::istream* playback_demo_stream;
   CodeController* demo_controller;
-  Console* console;
+
+  std::auto_ptr<Menu> game_menu;
+
+  float play_time; /**< total time in seconds that this session ran interactively */
 };
 
 #endif /*SUPERTUX_GAMELOOP_H*/