moved my personal scons todo to the global one, so that someone else can work on...

[supertux.git] / src / gameloop.h

diff --git a/src/gameloop.h b/src/gameloop.h
index 196a74a..d98ff54 100644 (file)
--- a/src/gameloop.h
+++ b/src/gameloop.h
@@ -22,8 +22,12 @@
 #ifndef SUPERTUX_GAMELOOP_H
 #define SUPERTUX_GAMELOOP_H
 
-#include "sound.h"
-#include "type.h"
+#include "special/timer.h"
+#include "special/base.h"
+#include "special/frame_rate.h"
+#include "statistics.h"
+
+using namespace SuperTux;
 
 /* GameLoop modes */
 
@@ -33,11 +37,20 @@
 #define ST_GL_LOAD_LEVEL_FILE  3
 #define ST_GL_DEMO_GAME  4
 
+enum GameMenuIDs {
+  MNID_CONTINUE,
+  MNID_ABORTLEVEL
+  };
+
 extern int game_started;
 
 class Level;
 class Sector;
+class Statistics;
+
+namespace SuperTux {
 class DrawingContext;
+}
 
 /** The GameSession class controlls the controll flow of a World, ie.
     present the menu on specifc keypresses, render and update it while
@@ -54,10 +67,8 @@ private:
   int st_gl_mode;
   int levelnb;
   float fps_fps;
-  unsigned int last_update_time;
-  unsigned int update_time;
+  FrameRate frame_rate;
   int pause_menu_frame;
-  int debug_fps;
 
   /** If true the end_sequence will be played, user input will be
       ignored while doing that */
@@ -77,6 +88,7 @@ private:
   // the sector and spawnpoint we shoudl spawn after this frame
   std::string newsector;
   std::string newspawnpoint;
+
 public:
   enum ExitStatus { ES_NONE, ES_LEVEL_FINISHED, ES_GAME_OVER, ES_LEVEL_ABORT };
 private:
@@ -85,7 +97,7 @@ public:
   DrawingContext* context;
   Timer time_left;
 
-  GameSession(const std::string& level, int mode, bool flip_level_ = false);
+  GameSession(const std::string& level, int mode, bool flip_level_ = false, Statistics* statistics = NULL);
   ~GameSession();
 
   /** Enter the busy loop */
@@ -106,6 +118,17 @@ public:
 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();
 
   void check_end_conditions();
@@ -117,7 +140,6 @@ private:
   void drawendscreen();
   void drawresultscreen(void);
 
-private:
   void on_escape_press();
   void process_menu();
 };
@@ -127,5 +149,8 @@ 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 */
+bool process_load_game_menu();
+
 #endif /*SUPERTUX_GAMELOOP_H*/