X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fvideo%2Fscreen.h;h=c3c1d82eee389498a8377db41d310fb8eaf866dd;hb=34af685218e35963af56490bdad1aec553da4e6c;hp=a1797fee36c8a1635eb49ecc1489836e4cc99bd8;hpb=edaacb3651cf0560314dd008d7243be4b3b2f8c6;p=supertux.git

diff --git a/lib/video/screen.h b/lib/video/screen.h
index a1797fee3..c3c1d82ee 100644
--- a/lib/video/screen.h
+++ b/lib/video/screen.h
@@ -26,6 +26,8 @@
 #endif
 #include <iostream>
 
+#include <vector>
+
 namespace SuperTux
   {
     
@@ -42,6 +44,16 @@ namespace SuperTux
           : red(red_), green(green_), blue(blue_), alpha(alpha_)
       {}
 
+      Color(std::vector <unsigned int> color)
+          : red(0), green(0), blue(0), alpha(255)
+      { if(color.size() >= 3) { red = color[0]; green = color[1]; blue = color[2]; }
+        if(color.size() == 4) alpha = color[3]; }
+
+      Color(std::vector <int> color)
+          : red(0), green(0), blue(0), alpha(255)
+      { if(color.size() >= 3) { red = color[0]; green = color[1]; blue = color[2]; }
+        if(color.size() == 4) alpha = color[3]; }
+
       Color(const Color& o)
           : red(o.red), green(o.green), blue(o.blue), alpha(o.alpha)
       { }
@@ -54,13 +66,19 @@ namespace SuperTux
         return false;
       }
 
+      Uint32 map_rgb(SDL_Surface* surface)
+        { return SDL_MapRGB(surface->format, red, green, blue); }
+      Uint32 map_rgba(SDL_Surface* surface)
+        { return SDL_MapRGBA(surface->format, red, green, blue, alpha); }
+
       Uint8 red, green, blue, alpha;
     };
 
 
   class Vector;
 
-  void putpixel(SDL_Surface *surface, int x, int y, Uint32 pixel);
+  Uint32 getpixel(SDL_Surface* surface, int x, int y);
+  void putpixel(SDL_Surface* surface, int x, int y, Uint32 pixel);
   void drawpixel(int x, int y, Uint32 pixel);
   void fillrect(float x, float y, float w, float h, int r, int g, int b, int a = 255);
   void draw_line(float x1, float y1, float x2, float y2, int r, int g, int b, int a = 255);