libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 07:41:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated SWORD1 with the latest changes to video players

Browse Source 
svn-id: r35760
This commit is contained in:
Filippos Karapetis 2009-01-06 17:49:41 +00:00
parent 9267961104
commit 4b24b4d06f
1 changed files with 5 additions and 4 deletions

9
engines/sword1/animation.cpp

@ -430,7 +430,7 @@ void MoviePlayerDXA::setPalette(byte *pal) {
}
bool MoviePlayerDXA::decodeFrame(void) {
if (_currentFrame < _framesCount) {
if ((uint32)_currentFrame < (uint32)getFrameCount()) {
decodeNextFrame();
return true;
}
@ -441,7 +441,8 @@ void MoviePlayerDXA::processFrame(void) {
}
void MoviePlayerDXA::updateScreen(void) {
_system->copyRectToScreen(_drawBuffer, _frameWidth, _frameX, _frameY, _frameWidth, _frameHeight);
Graphics::Surface *frameBuffer = _system->lockScreen();
copyFrameToBuffer((byte *)frameBuffer->pixels, _frameX, _frameY, _frameWidth);
// TODO: Handle the advanced cutscene packs. Do they really exist?
@ -452,7 +453,6 @@ void MoviePlayerDXA::updateScreen(void) {
// frame to it, and draw on that.
if (_textMan->giveSpriteData(2)) {
Graphics::Surface *frameBuffer = _system->lockScreen();
byte *src = (byte *)_textMan->giveSpriteData(2) + sizeof(FrameHeader);
byte *dst = (byte *)frameBuffer->getBasePtr(_textX, _textY);
@ -471,9 +471,10 @@ void MoviePlayerDXA::updateScreen(void) {
dst += frameBuffer->pitch;
}
_system->unlockScreen();
}
_system->unlockScreen();
_system->updateScreen();
}