From 754858641b23cec314fc483f82caed438d929da3 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 18 Jul 2013 23:40:08 +0300
Subject: FULLPIPE: Proper parameters for screen blitting

---
 engines/fullpipe/gfx.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index c59ab6303f..9f883279a6 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -343,12 +343,12 @@ void Picture::displayPicture() {
 	if (g_fullpipe->_needQuit)
 		return;
 
-	if (Common::String(_memfilename).hasSuffix(".dib"))
-		return;
-
 	getData();
 	init();
 
+	if (!_dataSize)
+		return;
+
 	g_fullpipe->_backgroundSurface.fillRect(Common::Rect(0, 0, 799, 599), 0);
 	g_fullpipe->_system->copyRectToScreen(g_fullpipe->_backgroundSurface.getBasePtr(0, 0), g_fullpipe->_backgroundSurface.pitch, 0, 0, 799, 599);
 
@@ -423,7 +423,7 @@ void Bitmap::putDib(int x, int y, int32 *palette) {
 
 							--endy1;
 							if (endy1 < _y) {
-								g_fullpipe->_system->copyRectToScreen(g_fullpipe->_backgroundSurface.getBasePtr(_x, _y), g_fullpipe->_backgroundSurface.pitch, _x, _y, endx, endy);
+								g_fullpipe->_system->copyRectToScreen(g_fullpipe->_backgroundSurface.getBasePtr(_x, _y), g_fullpipe->_backgroundSurface.pitch, _x, _y, endx + 1, MIN(endy + 1, 799));
 								return;
 							}
 							pos = _x;
-- 
cgit v1.2.3