diff options
| author | Strangerke | 2013-09-08 14:49:34 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-08 14:49:34 +0200 |
| commit | 599d2eeb06c937a4479cc751f4f9f5e94795c43b (patch) | |
| tree | 6efd0f887d7a1fd5082209a585d609983031c92d /engines/tucker/sequences.cpp | |
| parent | 7df4c94aeb6c1408d26d6ada58d728b6eac17717 (diff) | |
| parent | 03bf56ea82c0b89f4e61e5e0787a36473f999efa (diff) | |
| download | scummvm-rg350-599d2eeb06c937a4479cc751f4f9f5e94795c43b.tar.gz scummvm-rg350-599d2eeb06c937a4479cc751f4f9f5e94795c43b.tar.bz2 scummvm-rg350-599d2eeb06c937a4479cc751f4f9f5e94795c43b.zip | |
Merge branch 'master' into avalanche
Diffstat (limited to 'engines/tucker/sequences.cpp')
| -rw-r--r-- | engines/tucker/sequences.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index 16c4f4f6f0..bd03eed00b 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -763,7 +763,7 @@ bool AnimationSequencePlayer::decodeNextAnimationFrame(int index, bool copyDirty if (!copyDirtyRects) { for (uint16 y = 0; (y < surface->h) && (y < kScreenHeight); y++) - memcpy(_offscreenBuffer + y * kScreenWidth, (byte *)surface->pixels + y * surface->pitch, surface->w); + memcpy(_offscreenBuffer + y * kScreenWidth, (const byte *)surface->getBasePtr(0, y), surface->w); } else { _flicPlayer[index].copyDirtyRectsToBuffer(_offscreenBuffer, kScreenWidth); } @@ -811,7 +811,7 @@ void AnimationSequencePlayer::playIntroSeq19_20() { if (surface) for (int i = 0; i < kScreenWidth * kScreenHeight; ++i) if (_offscreenBuffer[i] == 0) - _offscreenBuffer[i] = *((byte *)surface->pixels + i); + _offscreenBuffer[i] = *((const byte *)surface->getPixels() + i); if (!framesLeft) _changeToNextSequence = true; |