X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.hpp;h=fdb8f4f965f0ac9f82174e9d1d2313aaad35a214;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=92a0b69875d583c45588100bf08c33735b3bb915;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/game_session.hpp b/src/game_session.hpp
index 92a0b6987..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;
@@ -62,6 +61,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);
+  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()
@@ -78,16 +83,10 @@ public:
    * resources for the current level/world
    */
   std::string get_working_directory();
-  void restart_level(bool fromBeginning = true);
+  void restart_level();
 
   void toggle_pause();
 
-  /**
-   * Allows adjusting the game speed with a factor. 1.0 means normal speed
-   * 0.0 means the game is stopped.
-   */
-  void adjust_game_speed(float factor);
-
 private:
   void check_end_conditions();
   void process_events();
@@ -101,7 +100,6 @@ private:
   void on_escape_press();
   void process_menu();
 
-  Timer endsequence_timer;
   std::auto_ptr<Level> level;
   std::auto_ptr<Surface> statistics_backdrop;
 
@@ -114,18 +112,10 @@ private:
   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;
 
@@ -133,9 +123,6 @@ private:
   std::string reset_sector;
   Vector reset_pos;
 
-  /// speed factos
-  float speed_factor;
-
   // the sector and spawnpoint we should spawn after this frame
   std::string newsector;
   std::string newspawnpoint;