aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-07-18 23:40:08 +0300
committerEugene Sandulenko2013-09-06 14:51:02 +0300
commit754858641b23cec314fc483f82caed438d929da3 (patch)
tree5ac5362fe25aa5cefa6e9bb8fc98424f58084fff /engines
parent5add3373fe08897ce43e9c435df7213c03beffac (diff)
downloadscummvm-rg350-754858641b23cec314fc483f82caed438d929da3.tar.gz
scummvm-rg350-754858641b23cec314fc483f82caed438d929da3.tar.bz2
scummvm-rg350-754858641b23cec314fc483f82caed438d929da3.zip
FULLPIPE: Proper parameters for screen blitting
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/gfx.cpp8
1 files changed, 4 insertions, 4 deletions
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;