diff options
| author | Strangerke | 2015-12-06 14:36:49 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:51 +0100 |
| commit | ef99d82d13fdbfcaedd8e5fdea243ba3740c5185 (patch) | |
| tree | 101a1f38bb0da064c9b37ba039b00d265b00940a /engines/lab/image.cpp | |
| parent | d9d2383d93760da2267170e786987ba91da1fa08 (diff) | |
| download | scummvm-rg350-ef99d82d13fdbfcaedd8e5fdea243ba3740c5185.tar.gz scummvm-rg350-ef99d82d13fdbfcaedd8e5fdea243ba3740c5185.tar.bz2 scummvm-rg350-ef99d82d13fdbfcaedd8e5fdea243ba3740c5185.zip | |
LAB: Move more functions to DisplayMan
Diffstat (limited to 'engines/lab/image.cpp')
| -rw-r--r-- | engines/lab/image.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/lab/image.cpp b/engines/lab/image.cpp index 45377aceda..ab63e96def 100644 --- a/engines/lab/image.cpp +++ b/engines/lab/image.cpp @@ -56,9 +56,9 @@ void Image::blitBitmap(uint16 xs, uint16 ys, Image *imDest, uint16 xd, uint16 yd, uint16 width, uint16 height, byte masked) { int w = width; int h = height; - int destWidth = (imDest) ? imDest->_width : g_lab->_screenWidth; - int destHeight = (imDest) ? imDest->_height : g_lab->_screenHeight; - byte *destBuffer = (imDest) ? imDest->_imageData : g_lab->getCurrentDrawingBuffer(); + int destWidth = (imDest) ? imDest->_width : g_lab->_graphics->_screenWidth; + int destHeight = (imDest) ? imDest->_height : g_lab->_graphics->_screenHeight; + byte *destBuffer = (imDest) ? imDest->_imageData : g_lab->_graphics->getCurrentDrawingBuffer(); if (xd + w > destWidth) w = destWidth - xd; @@ -117,20 +117,20 @@ void Image::readScreenImage(uint16 x, uint16 y) { int w = _width; int h = _height; - if (x + w > g_lab->_screenWidth) - w = g_lab->_screenWidth - x; + if (x + w > g_lab->_graphics->_screenWidth) + w = g_lab->_graphics->_screenWidth - x; - if (y + h > g_lab->_screenHeight) - h = g_lab->_screenHeight - y; + if (y + h > g_lab->_graphics->_screenHeight) + h = g_lab->_graphics->_screenHeight - y; if ((w > 0) && (h > 0)) { byte *s = _imageData; - byte *d = g_lab->getCurrentDrawingBuffer() + y * g_lab->_screenWidth + x; + byte *d = g_lab->_graphics->getCurrentDrawingBuffer() + y * g_lab->_graphics->_screenWidth + x; while (h-- > 0) { memcpy(s, d, w); s += _width; - d += g_lab->_screenWidth; + d += g_lab->_graphics->_screenWidth; } } } |