diff options
| author | Einar Johan Trøan Sømåen | 2012-06-01 17:50:51 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 13:07:42 +0200 |
| commit | b94c379263fcf3117a54b24c69a53ce89f5074f9 (patch) | |
| tree | b91afb2cbdccc130efc182f7ffc872ab874d4ba3 /engines/wintermute/graphics | |
| parent | ed88f83d548a5ad4da483a94d7cd8fbcec8af6bd (diff) | |
| download | scummvm-rg350-b94c379263fcf3117a54b24c69a53ce89f5074f9.tar.gz scummvm-rg350-b94c379263fcf3117a54b24c69a53ce89f5074f9.tar.bz2 scummvm-rg350-b94c379263fcf3117a54b24c69a53ce89f5074f9.zip | |
WINTERMUTE: Let blitting of non 32bpp surfaces fail with a warning instead of an error for now.
Diffstat (limited to 'engines/wintermute/graphics')
| -rw-r--r-- | engines/wintermute/graphics/transparentSurface.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |