thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add cyx's patch for bug #1035739 - SCUMM/SMUSH: Ugly palette change when video finishes

Browse source 
svn-id: r23216
This commit is contained in:
Travis Howell 2006-06-21 10:28:09 +00:00
parent 4b2aa54304
commit 286de879fd
5 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/scumm/scumm.cpp
View file

@ -364,6 +364,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
_bgNeedsRedraw = false;
_screenEffectFlag = false;
_completeScreenRedraw = false;
_disableFadeInEffect = false;
memset(&_cursor, 0, sizeof(_cursor));
memset(_grabbedCursor, 0, sizeof(_grabbedCursor));
_currentCursor = 0;
@ -1549,8 +1550,6 @@ int ScummEngine::go() {
while (!_quit) {
updatePalette();
diff -= _system->getMillis();
waitForTimer(delta * 15 + diff);
diff = _system->getMillis();
@ -1595,6 +1594,10 @@ int ScummEngine::scummLoop(int delta) {
// that it will be in a different state each time you run the program.
_rnd.getRandomNumber(2);
if (_game.version <= 6) {
updatePalette();
}
#ifndef DISABLE_HE
if (_game.heversion >= 90) {
((ScummEngine_v90he *)this)->_moviePlay->handleNextFrame();
@ -1755,6 +1758,9 @@ load_game:
handleMouseOver(oldEgo != VAR(VAR_EGO));
// Render everything to the screen.
if (_game.version >= 7) {
updatePalette();
}
drawDirtyScreenParts();
// FIXME / TODO: Try to move the following to scummLoop_handleSound or