diff options
| author | Eugene Sandulenko | 2015-12-08 21:33:03 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:58 +0100 |
| commit | cf020db741294c54dab66a0ed652bdee565d44d5 (patch) | |
| tree | db9f4307cf64712d8ccb0bd38d332366214c7086 /engines/lab/dispman.cpp | |
| parent | 9015cf72a326e5bac2eeb311b257690a01d4bc26 (diff) | |
| download | scummvm-rg350-cf020db741294c54dab66a0ed652bdee565d44d5.tar.gz scummvm-rg350-cf020db741294c54dab66a0ed652bdee565d44d5.tar.bz2 scummvm-rg350-cf020db741294c54dab66a0ed652bdee565d44d5.zip | |
LAB: Converted DisplayMan::_dispBitMap to a pointer.
Diffstat (limited to 'engines/lab/dispman.cpp')
| -rw-r--r-- | engines/lab/dispman.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index d3ad191f64..df42f173ef 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -61,10 +61,13 @@ DisplayMan::DisplayMan(LabEngine *vm) : _vm(vm) { for (int i = 0; i < 256 * 3; i++) _curvgapal[i] = 0; + + _dispBitMap = new BitMap; } DisplayMan::~DisplayMan() { freePict(); + delete _dispBitMap; } // From readPict.c. Reads in pictures and animations from disk. @@ -90,9 +93,9 @@ void DisplayMan::readPict(const char *filename, bool playOnce, bool onlyDiffData if (!_vm->_music->_doNotFilestopSoundEffect) _vm->_music->stopSoundEffect(); - _dispBitMap._bytesPerRow = _screenWidth; - _dispBitMap._rows = _screenHeight; - _dispBitMap._flags = BITMAPF_VIDEO; + _dispBitMap->_bytesPerRow = _screenWidth; + _dispBitMap->_rows = _screenHeight; + _dispBitMap->_flags = BITMAPF_VIDEO; _vm->_anim->readDiff(_curBitmap, playOnce, onlyDiffData); } @@ -110,14 +113,14 @@ byte *DisplayMan::readPictToMem(const char *filename, uint16 x, uint16 y) { if (!_vm->_music->_doNotFilestopSoundEffect) _vm->_music->stopSoundEffect(); - _dispBitMap._bytesPerRow = x; - _dispBitMap._rows = y; - _dispBitMap._flags = BITMAPF_NONE; - _dispBitMap._planes[0] = _curBitmap; - _dispBitMap._planes[1] = _dispBitMap._planes[0] + 0x10000; - _dispBitMap._planes[2] = _dispBitMap._planes[1] + 0x10000; - _dispBitMap._planes[3] = _dispBitMap._planes[2] + 0x10000; - _dispBitMap._planes[4] = _dispBitMap._planes[3] + 0x10000; + _dispBitMap->_bytesPerRow = x; + _dispBitMap->_rows = y; + _dispBitMap->_flags = BITMAPF_NONE; + _dispBitMap->_planes[0] = _curBitmap; + _dispBitMap->_planes[1] = _dispBitMap->_planes[0] + 0x10000; + _dispBitMap->_planes[2] = _dispBitMap->_planes[1] + 0x10000; + _dispBitMap->_planes[3] = _dispBitMap->_planes[2] + 0x10000; + _dispBitMap->_planes[4] = _dispBitMap->_planes[3] + 0x10000; _vm->_anim->readDiff(_curBitmap, true); |