diff options
| author | Martin Kiewitz | 2010-01-06 13:05:14 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-06 13:05:14 +0000 |
| commit | 7d7d23ce2b8d7d2a4725303d893f273f366be18c (patch) | |
| tree | 3f2a2f7cea3e9c839c56140cf4fefd4aefe5303c /engines/sci/graphics/picture.cpp | |
| parent | 86c1171b11edcfe28dab7a3ba282e8e75060b01c (diff) | |
| download | scummvm-rg350-7d7d23ce2b8d7d2a4725303d893f273f366be18c.tar.gz scummvm-rg350-7d7d23ce2b8d7d2a4725303d893f273f366be18c.tar.bz2 scummvm-rg350-7d7d23ce2b8d7d2a4725303d893f273f366be18c.zip | |
SCI: making most of the variables in screen class private (some of it was needed for old gui)
svn-id: r47075
Diffstat (limited to 'engines/sci/graphics/picture.cpp')
| -rw-r--r-- | engines/sci/graphics/picture.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp index 545616e062..d7d7fa63d6 100644 --- a/engines/sci/graphics/picture.cpp +++ b/engines/sci/graphics/picture.cpp @@ -81,8 +81,8 @@ void SciGuiPicture::draw(int16 animationNr, bool mirroredFlag, bool addToFlag, i void SciGuiPicture::reset() { int16 x, y; - for (y = _gfx->GetPort()->top; y < _screen->_height; y++) { - for (x = 0; x < _screen->_width; x++) { + for (y = _gfx->GetPort()->top; y < _screen->getHeight(); y++) { + for (x = 0; x < _screen->getWidth(); x++) { _screen->putPixel(x, y, SCI_SCREEN_MASK_ALL, 255, 0, 0); } } @@ -273,7 +273,7 @@ void SciGuiPicture::drawCelData(byte *inbuffer, int size, int headerPos, int rle // SCI1.1 games use color 0 as transparency and SCI1 games use color 255 as transparency. Sierra SCI seems to paint // the whole data to screen and wont skip over transparent pixels. So this will actually make it work like Sierra if (!_addToFlag) - clearColor = _screen->_colorWhite; + clearColor = _screen->getColorWhite(); ptr = celBitmap; if (!_mirroredFlag) { @@ -367,7 +367,7 @@ static const byte vector_defaultEGApriority[PIC_EGAPRIORITY_SIZE] = { void SciGuiPicture::drawVectorData(byte *data, int dataSize) { byte pic_op; - byte pic_color = _screen->_colorDefaultVectorData; + byte pic_color = _screen->getColorDefaultVectorData(); byte pic_priority = 255, pic_control = 255; int16 x = 0, y = 0, oldx, oldy; byte EGApalettes[PIC_EGAPALETTE_TOTALSIZE] = {0}; @@ -671,7 +671,7 @@ void SciGuiPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, // This logic was taken directly from sierra sci, floodfill will get aborted on various occations if (screenMask & SCI_SCREEN_MASK_VISUAL) { - if ((color == _screen->_colorWhite) || (searchColor != _screen->_colorWhite)) + if ((color == _screen->getColorWhite()) || (searchColor != _screen->getColorWhite())) return; } else if (screenMask & SCI_SCREEN_MASK_PRIORITY) { if ((priority == 0) || (searchPriority != 0)) @@ -957,7 +957,7 @@ void SciGuiPicture::vectorPattern(int16 x, int16 y, byte color, byte priority, b rect.top = y; rect.left = x; rect.setHeight((size*2)+1); rect.setWidth((size*2)+2); _gfx->OffsetRect(rect); - rect.clip(_screen->_width, _screen->_height); + rect.clip(_screen->getWidth(), _screen->getHeight()); if (code & SCI_PATTERN_CODE_RECTANGLE) { // Rectangle |