X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmainloop.cpp;h=e5db0246a58eb0e4e3d16a0a6335d01a1fa1a374;hb=665b4a4a6b0edae82fb830528f16d2176da44aa4;hp=5e2f3f76a9a531364648697a8baf27167b303151;hpb=7c579d3ef0a6667c18b53dad84c63c05d2760a84;p=supertux.git

diff --git a/src/mainloop.cpp b/src/mainloop.cpp
index 5e2f3f76a..e5db0246a 100644
--- a/src/mainloop.cpp
+++ b/src/mainloop.cpp
@@ -20,7 +20,7 @@
 
 #include "mainloop.hpp"
 
-#include <cstdlib>
+#include <stdlib.h>
 #include <SDL.h>
 #include "video/drawing_context.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
@@ -49,7 +49,7 @@ static const int MAX_FRAME_SKIP = 2;
 MainLoop* main_loop = NULL;
 
 MainLoop::MainLoop()
-  : speed(1.0), nextpop(false), nextpush(false), fps(0)
+  : speed(1.0), nextpop(false), nextpush(false), fps(0), screenshot_requested(false)
 {
   using namespace Scripting;
   TimeScheduler::instance = new TimeScheduler();
@@ -109,6 +109,12 @@ MainLoop::set_speed(float speed)
   this->speed = speed;
 }
 
+float
+MainLoop::get_speed() const
+{
+  return speed;
+}
+
 void
 MainLoop::draw_fps(DrawingContext& context, float fps_fps)
 {
@@ -135,6 +141,11 @@ MainLoop::draw(DrawingContext& context)
   if(config->show_fps)
     draw_fps(context, fps);
 
+  // if a screenshot was requested, pass request on to drawing_context
+  if (screenshot_requested) {
+    context.take_screenshot();
+    screenshot_requested = false;
+  }
   context.do_drawing();
 
   /* Calculate frames per second */
@@ -177,6 +188,9 @@ MainLoop::process_events()
       config->use_fullscreen = !config->use_fullscreen;
       init_video();
     }
+    else if (event.type == SDL_KEYDOWN && event.key.keysym.sym == SDLK_PRINT) {
+      take_screenshot();
+    }
   }
 }
 
@@ -214,10 +228,8 @@ MainLoop::handle_screen_switch()
 }
 
 void
-MainLoop::run()
+MainLoop::run(DrawingContext &context)
 {
-  DrawingContext context;
-
   Uint32 last_ticks = 0;
   Uint32 elapsed_ticks = 0;
 
@@ -262,3 +274,10 @@ MainLoop::run()
     SDL_Delay(0);
   }
 }
+
+void 
+MainLoop::take_screenshot()
+{
+  screenshot_requested = true;
+}
+