aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-07 11:16:49 +0200
committerWillem Jan Palenstijn2015-12-23 21:33:54 +0100
commitb6397c0af78e6cfecd1f1f7fe9c0686cd6e27daa (patch)
tree5546762035f880cc6124e341ce6fc4f6895dfc1f
parent0e886461d0c60f1d3f1f790da8755e35ed2883d3 (diff)
downloadscummvm-rg350-b6397c0af78e6cfecd1f1f7fe9c0686cd6e27daa.tar.gz
scummvm-rg350-b6397c0af78e6cfecd1f1f7fe9c0686cd6e27daa.tar.bz2
scummvm-rg350-b6397c0af78e6cfecd1f1f7fe9c0686cd6e27daa.zip
LAB: Use the correct bitmap buffer in the Anim class
-rw-r--r--engines/lab/anim.cpp2
-rw-r--r--engines/lab/anim.h1
-rw-r--r--engines/lab/lab.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index c5493e03e6..b28222c4b4 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -70,7 +70,7 @@ Anim::Anim(LabEngine *vm) : _vm(vm) {
_diffWidth = 0;
_diffHeight = 0;
_dataBytesPerRow = 0;
- DrawBitMap = &bit2;
+ DrawBitMap = &_vm->_graphics->bit1;
for (int i = 0; i < 3 * 256; i++)
_diffPalette[i] = 0;
diff --git a/engines/lab/anim.h b/engines/lab/anim.h
index a0438d862d..28927ba82d 100644
--- a/engines/lab/anim.h
+++ b/engines/lab/anim.h
@@ -84,7 +84,6 @@ private:
uint32 _diffWidth;
uint32 _diffHeight;
uint16 _dataBytesPerRow;
- BitMap bit2;
BitMap *DrawBitMap;
void runLengthDecode(byte *dest, byte *source);
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 3def00339c..ec81fdf427 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -144,8 +144,8 @@ Common::Error LabEngine::run() {
_event = new EventManager(this);
_resource = new Resource(this);
_music = new Music(this);
- _anim = new Anim(this);
_graphics = new DisplayMan(this);
+ _anim = new Anim(this);
if (getPlatform() == Common::kPlatformWindows) {
// Check if this is the Wyrmkeep trial