diff options
| author | Johannes Schickel | 2013-08-03 00:40:03 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-08-03 02:52:33 +0200 |
| commit | dd67e9f09939367f19b7ada1c51ca0760b0fda87 (patch) | |
| tree | 8a4667773d654ce1f2189f3917587c04b1054adc /engines/sci/video | |
| parent | 8617edea04cfb2439de54d3ce4e64f92e5bd0416 (diff) | |
| download | scummvm-rg350-dd67e9f09939367f19b7ada1c51ca0760b0fda87.tar.gz scummvm-rg350-dd67e9f09939367f19b7ada1c51ca0760b0fda87.tar.bz2 scummvm-rg350-dd67e9f09939367f19b7ada1c51ca0760b0fda87.zip | |
SCI: Prefer getBasePtr over direct Surface::pixels access.
Diffstat (limited to 'engines/sci/video')
| -rw-r--r-- | engines/sci/video/robot_decoder.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/video/seq_decoder.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp index 0337a8d306..775cd0d74b 100644 --- a/engines/sci/video/robot_decoder.cpp +++ b/engines/sci/video/robot_decoder.cpp @@ -210,7 +210,7 @@ void RobotDecoder::readNextPacket() { // Copy over the decompressed frame byte *inFrame = decompressedFrame; - byte *outFrame = (byte *)surface->pixels; + byte *outFrame = (byte *)surface->getBasePtr(0, 0); // Black out the surface memset(outFrame, 0, surface->w * surface->h); diff --git a/engines/sci/video/seq_decoder.cpp b/engines/sci/video/seq_decoder.cpp index a7b6346eca..54603ec1f1 100644 --- a/engines/sci/video/seq_decoder.cpp +++ b/engines/sci/video/seq_decoder.cpp @@ -119,7 +119,7 @@ const Graphics::Surface *SEQDecoder::SEQVideoTrack::decodeNextFrame() { _fileStream->seek(offset); if (frameType == kSeqFrameFull) { - byte *dst = (byte *)_surface->pixels + frameTop * SEQ_SCREEN_WIDTH + frameLeft; + byte *dst = (byte *)_surface->getBasePtr(frameLeft, frameTop); byte *linebuf = new byte[frameWidth]; @@ -133,7 +133,7 @@ const Graphics::Surface *SEQDecoder::SEQVideoTrack::decodeNextFrame() { } else { byte *buf = new byte[frameSize]; _fileStream->read(buf, frameSize); - decodeFrame(buf, rleSize, buf + rleSize, frameSize - rleSize, (byte *)_surface->pixels + SEQ_SCREEN_WIDTH * frameTop, frameLeft, frameWidth, frameHeight, colorKey); + decodeFrame(buf, rleSize, buf + rleSize, frameSize - rleSize, (byte *)_surface->getBasePtr(0, frameTop), frameLeft, frameWidth, frameHeight, colorKey); delete[] buf; } |
