Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

[supertux.git] / src / game_session.hpp

diff --git a/src/game_session.hpp b/src/game_session.hpp
index abc507e..4e76139 100644 (file)
--- a/src/game_session.hpp
+++ b/src/game_session.hpp
@@ -27,6 +27,7 @@
 #include "math/vector.hpp"
 #include "console.hpp"
 #include "video/surface.hpp"
+#include "object/endsequence.hpp"
 
 class Level;
 class Sector;
@@ -62,6 +63,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()
@@ -95,7 +102,6 @@ private:
   void on_escape_press();
   void process_menu();
 
-  Timer endsequence_timer;
   std::auto_ptr<Level> level;
   std::auto_ptr<Surface> statistics_backdrop;
 
@@ -108,16 +114,7 @@ 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;