From c1b5626bca1e0e08316353f1ead00ed763cd5380 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 13 Aug 2012 01:14:05 +0200
Subject: WINTERMUTE: Apply color-key to RGB-images, and upconvert them to
 RGBA.

---
 engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/wintermute/base/gfx/osystem')

diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index 7845390871..400bb1de41 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -149,8 +149,12 @@ bool BaseSurfaceOSystem::finishLoad() {
 		_surface = image->getSurface()->convertTo(g_system->getScreenFormat(), image->getPalette());
 		TransparentSurface trans(*_surface);
 		trans.applyColorKey(_ckRed, _ckGreen, _ckBlue, true);
-	} else if (image->getSurface()->format.bytesPerPixel == 4 && image->getSurface()->format != g_system->getScreenFormat()) {
+	} else if (image->getSurface()->format.bytesPerPixel >= 3 && image->getSurface()->format != g_system->getScreenFormat()) {
 		_surface = image->getSurface()->convertTo(g_system->getScreenFormat());
+		if (image->getSurface()->format.bytesPerPixel == 3) {
+			TransparentSurface trans(*_surface);
+			trans.applyColorKey(_ckRed, _ckGreen, _ckBlue, true);
+		}
 	} else {
 		_surface = new Graphics::Surface();
 		_surface->copyFrom(*image->getSurface());
-- 
cgit v1.2.3