diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/wsamovie.cpp | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/wsamovie.cpp')
| -rw-r--r-- | engines/kyra/wsamovie.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index 21ff80f033..f6aca2bb82 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -28,10 +28,12 @@ namespace Kyra { WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm) - : Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) { + : Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) { } -WSAMovie_v1::~WSAMovie_v1() { close(); } +WSAMovie_v1::~WSAMovie_v1() { + close(); +} int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf) { close(); @@ -95,7 +97,7 @@ int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf for (int i = 1; i < _numFrames + 2; ++i) { _frameOffsTable[i] = READ_LE_UINT32(wsaData); - if (_frameOffsTable[i]) + if (_frameOffsTable[i]) _frameOffsTable[i] -= frameDataOffs; wsaData += 4; } @@ -251,7 +253,7 @@ void WSAMovieAmiga::displayFrame(int frameNum, int pageNum, int x, int y, uint16 uint8 *dst; dst = _buffer; - memset(_buffer, 0, _width*_height); + memset(_buffer, 0, _width * _height); if (_currentFrame == _numFrames) { if (!(_flags & WF_NO_FIRST_FRAME)) { @@ -330,7 +332,7 @@ void WSAMovieAmiga::processFrame(int frameNum, uint8 *dst) { return; assert(frameNum <= _numFrames); - memset(dst, 0, _width*_height); + memset(dst, 0, _width * _height); const uint8 *src = _frameData + _frameOffsTable[frameNum]; Screen::decodeFrame4(src, _deltaBuffer, _deltaBufferSize); |