X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmainloop.hpp;h=47621f3480d77a43e7aa674218949f244730e821;hb=d753e2c21ae6af1fb8876529695dcc7f6a46e5f0;hp=dfb2f9ed4d3a6787b826896a6fe0b05c5ef9e185;hpb=fc73efa7ff699fe3c9c237845b6f4fda0d999862;p=supertux.git

diff --git a/src/mainloop.hpp b/src/mainloop.hpp
index dfb2f9ed4..47621f348 100644
--- a/src/mainloop.hpp
+++ b/src/mainloop.hpp
@@ -21,9 +21,11 @@
 
 #include <memory>
 #include <vector>
+#include "scripting/thread_queue.hpp"
 
 class Screen;
 class Console;
+class ScreenFade;
 class DrawingContext;
 
 class MainLoop
@@ -33,22 +35,28 @@ public:
   ~MainLoop();
   
   void run();
-  void exit_screen();
-  void quit();
+  void exit_screen(ScreenFade* fade = NULL);
+  void quit(ScreenFade* fade = NULL);
   void set_speed(float speed);
 
   // push new screen on screen_stack
-  void push_screen(Screen* screen);
+  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;
+  std::auto_ptr<ScreenFade> screen_fade;
   std::vector<Screen*> screen_stack;
 };