diff options
| author | Paul Gilbert | 2014-05-20 08:37:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-05-20 08:37:42 -0400 |
| commit | 8a08a19097b4338c73dc9456622b75233b9b0194 (patch) | |
| tree | ecc7b90f90de253d33bba1a42fcfd7a766139cf6 /engines/groovie | |
| parent | 555b4dfd6e076dd5ef5cfc982fb5dbf3e211d198 (diff) | |
| parent | c1890cc739d94c4310ec8933b8fca3f43b8df294 (diff) | |
| download | scummvm-rg350-8a08a19097b4338c73dc9456622b75233b9b0194.tar.gz scummvm-rg350-8a08a19097b4338c73dc9456622b75233b9b0194.tar.bz2 scummvm-rg350-8a08a19097b4338c73dc9456622b75233b9b0194.zip | |
Merge branch 'master' into mads
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/roq.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/roq.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 4b3fb81828..2776a0455d 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -45,7 +45,7 @@ namespace Groovie { ROQPlayer::ROQPlayer(GroovieEngine *vm) : VideoPlayer(vm), _codingTypeCount(0), - _fg(&_vm->_graphicsMan->_foreground), _bg(&_vm->_graphicsMan->_background) { + _bg(&_vm->_graphicsMan->_background) { // Create the work surfaces _currBuf = new Graphics::Surface(); diff --git a/engines/groovie/roq.h b/engines/groovie/roq.h index 0e82983e63..cd5e91c82b 100644 --- a/engines/groovie/roq.h +++ b/engines/groovie/roq.h @@ -75,7 +75,7 @@ private: byte _codebook4[256 * 4]; // Buffers - Graphics::Surface *_fg, *_bg, *_thirdBuf; + Graphics::Surface *_bg; Graphics::Surface *_currBuf, *_prevBuf; void buildShowBuf(); byte _scaleX, _scaleY; |