fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / mainloop.hpp

diff --git a/src/mainloop.hpp b/src/mainloop.hpp
index 5e51d2d..a69baaf 100644 (file)
--- a/src/mainloop.hpp
+++ b/src/mainloop.hpp
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <vector>
+#include "scripting/thread_queue.hpp"
 
 class Screen;
 class Console;
@@ -32,7 +33,7 @@ class MainLoop
 public:
   MainLoop();
   ~MainLoop();
-  
+
   void run();
   void exit_screen(ScreenFade* fade = NULL);
   void quit(ScreenFade* fade = NULL);
@@ -42,12 +43,16 @@ public:
   void push_screen(Screen* screen, ScreenFade* fade = NULL);
   void set_screen_fade(ScreenFade* fade);
 
+  /// threads that wait for a screenswitch
+  Scripting::ThreadQueue waiting_threads;
+
 private:
   void draw_fps(DrawingContext& context, float fps);
-  
+
   bool running;
   float speed;
   bool nextpop;
+  bool nextpush;
   std::auto_ptr<Screen> next_screen;
   std::auto_ptr<Screen> current_screen;
   std::auto_ptr<Console> console;
@@ -58,4 +63,3 @@ private:
 extern MainLoop* main_loop;
 
 #endif
-