X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.hpp;h=ec3fffbe32667c7f0a1c0a11af9197136f913e9c;hb=b917bb4789b14d1bb1445b9777ab494e9623fd50;hp=b9e1ff134932050f8d0ae12488643483bf657a9a;hpb=acb7eebc740130088f5a13ad637661cf3bb28ab4;p=supertux.git

diff --git a/src/game_session.hpp b/src/game_session.hpp
index b9e1ff134..ec3fffbe3 100644
--- a/src/game_session.hpp
+++ b/src/game_session.hpp
@@ -21,12 +21,11 @@
 
 #include <string>
 #include <SDL.h>
+#include <squirrel.h>
 #include "screen.hpp"
-#include "timer.hpp"
-#include "statistics.hpp"
 #include "math/vector.hpp"
-#include "console.hpp"
 #include "video/surface.hpp"
+#include "object/endsequence.hpp"
 
 class Level;
 class Sector;
@@ -36,8 +35,7 @@ class CodeController;
 class Menu;
 
 /**
- * The GameSession class controlls the controll flow of the Game (the part
- * where you actually play a level)
+ * Screen that runs a Level, where Players run and jump through Sectors.
  */
 class GameSession : public Screen
 {
@@ -46,6 +44,7 @@ public:
   ~GameSession();
 
   void record_demo(const std::string& filename);
+  int get_demo_random_seed(const std::string& filename);
   void play_demo(const std::string& filename);
 
   void draw(DrawingContext& context);
@@ -61,8 +60,12 @@ public:
   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 display_info_box(const std::string& text);
-  
+  std::string get_reset_point_sectorname()
+  { return reset_sector; }
+
+  Vector get_reset_point_pos()
+  { return reset_pos; }
+
   Sector* get_current_sector()
   { return currentsector; }
 
@@ -77,41 +80,48 @@ public:
    * resources for the current level/world
    */
   std::string get_working_directory();
-  void restart_level(bool fromBeginning = true);
+  void restart_level();
+
+  void toggle_pause();
+
+  /**
+   * Enters or leaves level editor mode
+   */
+  void set_editmode(bool edit_mode = true);
+
+  /**
+   * Forces all Players to enter ghost mode
+   */
+  void force_ghost_mode();
 
 private:
   void check_end_conditions();
   void process_events();
   void capture_demo_step();
 
-  void levelintro();
   void drawstatus(DrawingContext& context);
   void draw_pause(DrawingContext& context);
 
+  HSQUIRRELVM run_script(std::istream& in, const std::string& sourcename);
   void on_escape_press();
   void process_menu();
 
-  Timer endsequence_timer;
   std::auto_ptr<Level> level;
   std::auto_ptr<Surface> statistics_backdrop;
 
+  // scripts
+  typedef std::vector<HSQOBJECT> ScriptList;
+  ScriptList scripts;
+
   Sector* currentsector;
 
   int levelnb;
   int pause_menu_frame;
 
-  /** If true the end_sequence will be played, user input will be
-      ignored while doing that */
-  enum EndSequenceState {
-    NO_ENDSEQUENCE,
-    ENDSEQUENCE_RUNNING, // tux is running right
-    ENDSEQUENCE_WAITING  // waiting for the end of the music
-  };
-  EndSequenceState end_sequence;
-  float last_x_pos;
-  CodeController* end_sequence_controller;
+  EndSequence* end_sequence;
 
-  bool game_pause;
+  bool  game_pause;
+  float speed_before_pause;
 
   std::string levelfile;
 
@@ -135,7 +145,9 @@ private:
   std::auto_ptr<Menu> game_menu;
 
   float play_time; /**< total time in seconds that this session ran interactively */
+
+  bool edit_mode; /**< true if GameSession runs in level editor mode */
+  bool levelintro_shown; /**< true if the LevelIntro screen was already shown */
 };
 
 #endif /*SUPERTUX_GAMELOOP_H*/
-