← Back to branch summary

~ubuntu-branches/ubuntu/raring/scummvm/raring

« back to all changes in this revision

Viewing changes to engines/sci/graphics/palette.cpp

  • Committer: Package Import Robot
  • Author(s): Moritz Muehlenhoff
  • Date: 2012-01-14 11:39:15 UTC
  • mfrom: (21.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20120114113915-hy9kyzbyncrqen3y
Tags: 1.4.1-1
* New upstream release
* Install translations.dat into scummvm-data    

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/sci/graphics/palette.cpp
709
709
}
710
710
 
711
711
void GfxPalette::palVaryInstallTimer() {
 
712
        // Remove any possible leftover palVary timer callbacks.
 
713
        // This happens for example in QFG1VGA, when sleeping at Erana's place
 
714
        // (bug #3439240) - the nighttime to daytime effect clashes with the
 
715
        // scene transition effect, as we load scene images too quickly for
 
716
        // the SCI scripts in that case (also refer to kernelPalVaryInit).
 
717
        palVaryRemoveTimer();
 
718
 
712
719
        int16 ticks = _palVaryTicks > 0 ? _palVaryTicks : 1;
713
720
        // Call signal increase every [ticks]
714
721
        g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this, "sciPalette");