merge SurfaceKeyColored into Surface

svn-id: r35951

1 files changed, 38 insertions, 0 deletions

diff --git a/graphics/surface.cpp b/graphics/surface.cpp
index 263a4fd23b..df882bf4ff 100644
--- a/graphics/surface.cpp
+++ b/graphics/surface.cpp
@@ -225,4 +225,42 @@ void Surface::move(int dx, int dy, int height) {
 	}
 }
 
+void Surface::blit(Surface *surf_src, int16 x, int16 y, OverlayColor transparent) {
+	if (bytesPerPixel != sizeof(OverlayColor) || surf_src->bytesPerPixel != sizeof(OverlayColor)) return ;
+
+	const OverlayColor *src = (const OverlayColor*)surf_src->pixels;
+	int blitW = surf_src->w;
+	int blitH = surf_src->h;
+
+	// clip co-ordinates
+	if (x < 0) {
+		blitW += x;
+		src -= x;
+		x = 0;
+	}
+	if (y < 0) {
+		blitH += y;
+		src -= y * surf_src->w;
+		y = 0;
+	}
+	if (blitW > w - x) blitW = w - x;
+	if (blitH > h - y) blitH = h - y;
+	if (blitW <= 0 || blitH <= 0)
+		return;
+
+	OverlayColor *dst = (OverlayColor*) getBasePtr(x, y);
+	int dstAdd = w - blitW;
+	int srcAdd = surf_src->w - blitW;
+
+	for (int i = 0; i < blitH; ++i) { 
+		for (int j = 0; j < blitW; ++j, ++dst, ++src) { 
+			OverlayColor col = *src;
+			if (col != transparent)
+				*dst = col;
+		}
+		dst += dstAdd;
+		src += srcAdd; 
+	}
+}
+
 } // End of namespace Graphics