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

diff --git a/src/game_session.hpp b/src/game_session.hpp
index b9e1ff134..fdb8f4f96 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;
@@ -46,6 +45,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 +61,14 @@ 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);
+  std::string get_reset_point_sectorname()
+  { return reset_sector; }
+
+  Vector get_reset_point_pos()
+  { return reset_pos; }
+
   void display_info_box(const std::string& text);
-  
+
   Sector* get_current_sector()
   { return currentsector; }
 
@@ -77,7 +83,9 @@ public:
    * resources for the current level/world
    */
   std::string get_working_directory();
-  void restart_level(bool fromBeginning = true);
+  void restart_level();
+
+  void toggle_pause();
 
 private:
   void check_end_conditions();
@@ -88,30 +96,26 @@ private:
   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;
 
@@ -138,4 +142,3 @@ private:
 };
 
 #endif /*SUPERTUX_GAMELOOP_H*/
-