X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.hpp;h=ec3fffbe32667c7f0a1c0a11af9197136f913e9c;hb=98dfd58973cda2eebb77cdc0241d9a8c7c745371;hp=87d0b3e0a34e4c2682630fb7a0aa969dc9b1ea43;hpb=f2d345c3ccec7743e39df2f59e546ad415257b81;p=supertux.git

diff --git a/src/game_session.hpp b/src/game_session.hpp
index 87d0b3e0a..ec3fffbe3 100644
--- a/src/game_session.hpp
+++ b/src/game_session.hpp
@@ -21,11 +21,9 @@
 
 #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"
 
@@ -37,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
 {
@@ -65,12 +62,10 @@ public:
   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; }
 
@@ -85,16 +80,25 @@ 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);
 
@@ -116,7 +120,8 @@ private:
 
   EndSequence* end_sequence;
 
-  bool game_pause;
+  bool  game_pause;
+  float speed_before_pause;
 
   std::string levelfile;
 
@@ -140,6 +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*/