[Pingus-CVS] r3789 - in trunk/pingus/src: . display

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-11 15:02:05 +0200 (Fri, 11 Jul 2008)
New Revision: 3789

Modified:
   trunk/pingus/src/display/framebuffer.cpp
   trunk/pingus/src/display/framebuffer.hpp
   trunk/pingus/src/screenshot.cpp
Log:
Removed Framebuffer::get_screen() and clear()

Modified: trunk/pingus/src/display/framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/framebuffer.cpp    2008-07-11 12:59:31 UTC (rev 
3788)
+++ trunk/pingus/src/display/framebuffer.cpp    2008-07-11 13:02:05 UTC (rev 
3789)
@@ -397,12 +397,6 @@
       exit(1);
     }
 }
-  
-void
-Framebuffer::clear()
-{
-  SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
-}
 
 void
 Framebuffer::push_cliprect(const Rect& rect)

Modified: trunk/pingus/src/display/framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/framebuffer.hpp    2008-07-11 12:59:31 UTC (rev 
3788)
+++ trunk/pingus/src/display/framebuffer.hpp    2008-07-11 13:02:05 UTC (rev 
3789)
@@ -35,7 +35,6 @@
 
   void set_video_mode(int width, int height, bool fullscreen);
   void flip();
-  void clear();
 
   void push_cliprect(const Rect&);
   void pop_cliprect();
@@ -50,7 +49,6 @@
 
   Size get_size();
 
-  SDL_Surface* get_screen() { return screen; }
 private:
   Framebuffer (const Framebuffer&);
   Framebuffer& operator= (const Framebuffer&);

Modified: trunk/pingus/src/screenshot.cpp
===================================================================
--- trunk/pingus/src/screenshot.cpp     2008-07-11 12:59:31 UTC (rev 3788)
+++ trunk/pingus/src/screenshot.cpp     2008-07-11 13:02:05 UTC (rev 3789)
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <fstream>
 #include <iostream>
+
 #include "display/display.hpp"
 #include "display/framebuffer.hpp"
 #include "system.hpp"
@@ -34,7 +35,7 @@
 {
   std::string filename = get_filename();
   std::cout << _("Screenshot: Saving screenshot to: ") << filename << 
std::endl;
-  save(Display::get_framebuffer().get_screen(), filename);
+  save(SDL_GetVideoSurface(), filename);
   std::cout << _("Screenshot: Screenshot is done.") << std::endl;
   
   return filename;