X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameloop.h;h=ea1df562ae80b9af0496f970bbb5c68a53b9864c;hb=9599042661b468aae7bd34dca05441c0ebc93ad7;hp=d98ff54f4ed798ff1a57ce15a1610296942562b7;hpb=1dd7efd08b81efc1066381c5a1723592bb653d7d;p=supertux.git

diff --git a/src/gameloop.h b/src/gameloop.h
index d98ff54f4..ea1df562a 100644
--- a/src/gameloop.h
+++ b/src/gameloop.h
@@ -22,9 +22,7 @@
 #ifndef SUPERTUX_GAMELOOP_H
 #define SUPERTUX_GAMELOOP_H
 
-#include "special/timer.h"
-#include "special/base.h"
-#include "special/frame_rate.h"
+#include "timer.h"
 #include "statistics.h"
 
 using namespace SuperTux;
@@ -58,16 +56,14 @@ class DrawingContext;
 class GameSession
 {
 private:
-  Timer fps_timer;
-  Timer frame_timer;
-  Timer endsequence_timer;
+  Uint32 fps_ticks;
+  Timer2 endsequence_timer;
   Level* level;
   Sector* currentsector;
 
   int st_gl_mode;
   int levelnb;
   float fps_fps;
-  FrameRate frame_rate;
   int pause_menu_frame;
 
   /** If true the end_sequence will be played, user input will be
@@ -82,8 +78,7 @@ private:
 
   bool game_pause;
 
-  std::string levelname;
-  bool flip_level;
+  std::string levelfile;
 
   // the sector and spawnpoint we shoudl spawn after this frame
   std::string newsector;
@@ -95,16 +90,16 @@ private:
   ExitStatus exit_status;
 public:
   DrawingContext* context;
-  Timer time_left;
+  Timer2 time_left;
 
-  GameSession(const std::string& level, int mode, bool flip_level_ = false, Statistics* statistics = NULL);
+  GameSession(const std::string& levelfile, int mode, Statistics* statistics=0);
   ~GameSession();
 
   /** Enter the busy loop */
   ExitStatus run();
 
   void draw();
-  void action(double frame_ratio);
+  void action(float frame_ratio);
 
   void set_current()
   { current_ = this; }
@@ -114,14 +109,14 @@ public:
       const std::string& spawnpointname);
   Sector* get_current_sector()
   { return currentsector; }
+
+  void start_sequence(const std::string& sequencename);
   
 private:
   static GameSession* current_;
 
   // for cheating
   std::string last_keys;
-  // for fire works
-  Timer random_timer;
 
   // swap points
   Vector last_swap_point;
@@ -134,6 +129,7 @@ private:
   void check_end_conditions();
   void start_timers();
   void process_events();
+  void handle_cheats();
 
   void levelintro();
   void drawstatus(DrawingContext& context);
@@ -146,7 +142,6 @@ private:
 
 std::string slotinfo(int slot);
 
-bool rectcollision(base_type* one, base_type* two);
 void bumpbrick(float x, float y);
 
 /** Return true if the gameloop() was entered, false otherwise */