From b94c379263fcf3117a54b24c69a53ce89f5074f9 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 1 Jun 2012 17:50:51 +0200 Subject: WINTERMUTE: Let blitting of non 32bpp surfaces fail with a warning instead of an error for now. --- engines/wintermute/graphics/transparentSurface.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/wintermute/graphics') diff --git a/engines/wintermute/graphics/transparentSurface.cpp b/engines/wintermute/graphics/transparentSurface.cpp index 1f13e15c55..d7f8719b6e 100644 --- a/engines/wintermute/graphics/transparentSurface.cpp +++ b/engines/wintermute/graphics/transparentSurface.cpp @@ -71,7 +71,8 @@ Common::Rect TransparentSurface::blit(Graphics::Surface &target, int posX, int p TransparentSurface srcImage(*this, false); // TODO: Is the data really in the screen format? if (format.bytesPerPixel != 4) { - error("TransparentSurface can only blit 32 bpp images"); + warning("TransparentSurface can only blit 32 bpp images"); + return retSize; } if (pPartRect) { -- cgit v1.2.3