aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2015-12-22 19:45:16 +0100
committerWillem Jan Palenstijn2015-12-23 21:35:34 +0100
commit8c9d65b8cbfad71c9751d982ee15ea4be856f6d9 (patch)
tree3adb92a5f56eaec8da989afbde8cfd4f780712f2 /engines
parentbe4c436dcaa960bceedd6d526041df06919bc225 (diff)
downloadscummvm-rg350-8c9d65b8cbfad71c9751d982ee15ea4be856f6d9.tar.gz
scummvm-rg350-8c9d65b8cbfad71c9751d982ee15ea4be856f6d9.tar.bz2
scummvm-rg350-8c9d65b8cbfad71c9751d982ee15ea4be856f6d9.zip
LAB: Rename a member of Anim
Diffstat (limited to 'engines')
-rw-r--r--engines/lab/anim.cpp12
-rw-r--r--engines/lab/anim.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index d59a5711a8..ee9fd64c89 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -68,7 +68,7 @@ Anim::Anim(LabEngine *vm) : _vm(vm) {
_doBlack = false;
_diffWidth = 0;
_diffHeight = 0;
- DrawBitMap = _vm->_graphics->_dispBitMap;
+ _drawBitMap = _vm->_graphics->_dispBitMap;
for (int i = 0; i < 3 * 256; i++)
_diffPalette[i] = 0;
@@ -145,14 +145,14 @@ void Anim::diffNextFrame(bool onlyDiffData) {
case 10:
if (onlyDiffData)
warning("Boom");
- _diffFile->read(DrawBitMap->_planes[_curBit], _size);
+ _diffFile->read(_drawBitMap->_planes[_curBit], _size);
_curBit++;
break;
case 11:
curPos = _diffFile->pos();
_diffFile->skip(4);
- _vm->_utils->runLengthDecode(DrawBitMap->_planes[_curBit], _diffFile);
+ _vm->_utils->runLengthDecode(_drawBitMap->_planes[_curBit], _diffFile);
_curBit++;
_diffFile->seek(curPos + _size, SEEK_SET);
break;
@@ -160,21 +160,21 @@ void Anim::diffNextFrame(bool onlyDiffData) {
case 12:
curPos = _diffFile->pos();
_diffFile->skip(4);
- _vm->_utils->verticalRunLengthDecode(DrawBitMap->_planes[_curBit], _diffFile, DrawBitMap->_bytesPerRow);
+ _vm->_utils->verticalRunLengthDecode(_drawBitMap->_planes[_curBit], _diffFile, _drawBitMap->_bytesPerRow);
_curBit++;
_diffFile->seek(curPos + _size, SEEK_SET);
break;
case 20:
curPos = _diffFile->pos();
- _vm->_utils->unDiff(DrawBitMap->_planes[_curBit], _vm->_graphics->_dispBitMap->_planes[_curBit], _diffFile, DrawBitMap->_bytesPerRow, false);
+ _vm->_utils->unDiff(_drawBitMap->_planes[_curBit], _vm->_graphics->_dispBitMap->_planes[_curBit], _diffFile, _drawBitMap->_bytesPerRow, false);
_curBit++;
_diffFile->seek(curPos + _size, SEEK_SET);
break;
case 21:
curPos = _diffFile->pos();
- _vm->_utils->unDiff(DrawBitMap->_planes[_curBit], _vm->_graphics->_dispBitMap->_planes[_curBit], _diffFile, DrawBitMap->_bytesPerRow, true);
+ _vm->_utils->unDiff(_drawBitMap->_planes[_curBit], _vm->_graphics->_dispBitMap->_planes[_curBit], _diffFile, _drawBitMap->_bytesPerRow, true);
_curBit++;
_diffFile->seek(curPos + _size, SEEK_SET);
break;
diff --git a/engines/lab/anim.h b/engines/lab/anim.h
index 3c236f39ff..2a87cc571a 100644
--- a/engines/lab/anim.h
+++ b/engines/lab/anim.h
@@ -71,7 +71,7 @@ private:
uint16 _sampleSpeed;
uint32 _diffWidth;
uint32 _diffHeight;
- BitMap *DrawBitMap;
+ BitMap *_drawBitMap;
public:
Anim(LabEngine *vm);