X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameloop.h;h=d1898be8ff736fd89e83296cbef1aee2e9810867;hb=763454f90866bd4e7db95e5884c48a25d6b9bda1;hp=1bc6b10729a5d0b9f60ddb821e7cf60aad0f3437;hpb=0acb7e4b13d8f4a61ff354502429b1263b0a831f;p=supertux.git

diff --git a/src/gameloop.h b/src/gameloop.h
index 1bc6b1072..d1898be8f 100644
--- a/src/gameloop.h
+++ b/src/gameloop.h
@@ -22,9 +22,8 @@
 #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;
 
@@ -57,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
@@ -81,7 +78,7 @@ private:
 
   bool game_pause;
 
-  std::string levelname;
+  std::string levelfile;
   bool flip_level;
 
   // the sector and spawnpoint we shoudl spawn after this frame
@@ -94,16 +91,17 @@ 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, bool flip_level_ = false,
+          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; }
@@ -113,14 +111,20 @@ 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;
+  Statistics last_swap_stats;
+
+  Statistics* best_level_statistics;
 
   void restart_level();
 
@@ -135,13 +139,10 @@ private:
 
   void on_escape_press();
   void process_menu();
-
-  Statistics* best_level_statistics;
 };
 
 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 */