- some indentation

[supertux.git] / src / gameloop.h

diff --git a/src/gameloop.h b/src/gameloop.h
index 196a74a..5e71456 100644 (file)
--- a/src/gameloop.h
+++ b/src/gameloop.h
@@ -22,8 +22,11 @@
 #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"
+
+using namespace SuperTux;
 
 /* GameLoop modes */
 
@@ -33,11 +36,19 @@
 #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;
+
+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,8 +65,7 @@ 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;
 
@@ -127,5 +137,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*/