aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2016-01-08 01:59:29 +0200
committerFilippos Karapetis2016-01-08 02:01:28 +0200
commite3b9f726a1361d60cf693429095950826766fe93 (patch)
tree7ba293824d08378d03ed24bccc9897cc8773fb3b
parent5b5efd4cbe4a592c654788c612f7229ee45822a0 (diff)
downloadscummvm-rg350-e3b9f726a1361d60cf693429095950826766fe93.tar.gz
scummvm-rg350-e3b9f726a1361d60cf693429095950826766fe93.tar.bz2
scummvm-rg350-e3b9f726a1361d60cf693429095950826766fe93.zip
LAB: Remove superfluous class variables
-rw-r--r--engines/lab/anim.cpp8
-rw-r--r--engines/lab/anim.h2
2 files changed, 2 insertions, 8 deletions
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index 01ca905cee..6e2f6fd81d 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -62,8 +62,6 @@ Anim::Anim(LabEngine *vm) : _vm(vm) {
_stopPlayingEnd = false;
_sampleSpeed = 0;
_doBlack = false;
- _diffWidth = 0;
- _diffHeight = 0;
for (int i = 0; i < 3 * 256; i++)
_diffPalette[i] = 0;
@@ -97,7 +95,7 @@ void Anim::diffNextFrame(bool onlyDiffData) {
startOfBuf = _vm->_graphics->getCurrentDrawingBuffer();
drawOnScreen = true;
}
- byte *endOfBuf = startOfBuf + (int)_diffWidth * _diffHeight;
+ byte *endOfBuf = startOfBuf + (int)_headerdata._width * _headerdata._height;
int curBit = 0;
@@ -328,9 +326,7 @@ void Anim::readDiff(Common::File *diffFile, bool playOnce, bool onlyDiffData) {
_diffFile->skip(_size - 18);
_continuous = CONTINUOUS & _headerdata._flags;
- _diffWidth = _headerdata._width;
- _diffHeight = _headerdata._height;
- _vm->_utils->setBytesPerRow(_diffWidth);
+ _vm->_utils->setBytesPerRow(_headerdata._width);
delete[] _scrollScreenBuffer;
_scrollScreenBuffer = nullptr;
diff --git a/engines/lab/anim.h b/engines/lab/anim.h
index bdb02e3f02..7006787c61 100644
--- a/engines/lab/anim.h
+++ b/engines/lab/anim.h
@@ -62,8 +62,6 @@ private:
uint32 _size;
bool _stopPlayingEnd;
uint16 _sampleSpeed;
- uint32 _diffWidth;
- uint32 _diffHeight;
byte *_outputBuffer;
DIFFHeader _headerdata;