diff options
| author | Max Horn | 2003-06-07 22:56:47 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-07 22:56:47 +0000 |
| commit | 209cd912cfdfc6fd5b69c9c3b77b227f6b6324aa (patch) | |
| tree | 95b3653f2d21ebadba2c7d0b1abbdc113adc4c29 /scumm | |
| parent | fedc3b7e62e11dc119d4ec80b7e25e7a11d4f43e (diff) | |
| download | scummvm-rg350-209cd912cfdfc6fd5b69c9c3b77b227f6b6324aa.tar.gz scummvm-rg350-209cd912cfdfc6fd5b69c9c3b77b227f6b6324aa.tar.bz2 scummvm-rg350-209cd912cfdfc6fd5b69c9c3b77b227f6b6324aa.zip | |
cleanup
svn-id: r8384
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/gfx.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 066cf2aae4..f70322b16c 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -2147,12 +2147,12 @@ void Scumm::fadeIn(int effect) { case 3: case 4: case 5: - // Some of the transition effects won't work properly unless - // the screen is marked as clean first. At first I thought I - // could safely do this every time fadeIn() was called, but - // that broke the FOA intro. Probably other things as well. - // - // Hopefully it's safe to do it at this point, at least. + // Some of the transition effects won't work properly unless + // the screen is marked as clean first. At first I thought I + // could safely do this every time fadeIn() was called, but + // that broke the FOA intro. Probably other things as well. + // + // Hopefully it's safe to do it at this point, at least. virtscr[0].setDirtyRange(0, 0); transitionEffect(effect - 1); break; @@ -2180,16 +2180,16 @@ void Scumm::fadeIn(int effect) { } void Scumm::fadeOut(int effect) { - VirtScreen *vs; + VirtScreen *vs = &virtscr[0]; - virtscr[0].setDirtyRange(0, 0); + vs->setDirtyRange(0, 0); if (!(_features & GF_NEW_CAMERA)) camera._last.x = camera._cur.x; if (_screenEffectFlag && effect != 0) { // Fill screen 0 with black - vs = &virtscr[0]; + memset(vs->screenPtr + vs->xstart, 0, vs->size); // Fade to black with the specified effect, if any. @@ -2206,7 +2206,7 @@ void Scumm::fadeOut(int effect) { break; case 129: // Just blit screen 0 to the display (i.e. display will be black) - virtscr[0].setDirtyRange(0, vs->height); + vs->setDirtyRange(0, vs->height); updateDirtyScreen(0); break; case 134: |