diff options
| author | Eugene Sandulenko | 2007-08-31 11:14:32 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2007-08-31 11:14:32 +0000 |
| commit | 89e10f450fa29513e01941b49ca80826322ff380 (patch) | |
| tree | a98ee3c932fe09be4ba5a00985e34b1e835e0452 /engines/saga | |
| parent | dc0088f8fd2f168a38042678f7e0f3a2c083f47f (diff) | |
| download | scummvm-rg350-89e10f450fa29513e01941b49ca80826322ff380.tar.gz scummvm-rg350-89e10f450fa29513e01941b49ca80826322ff380.tar.bz2 scummvm-rg350-89e10f450fa29513e01941b49ca80826322ff380.zip | |
Simplify fading code a bit.
svn-id: r28772
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/ihnm_introproc.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/saga/ihnm_introproc.cpp b/engines/saga/ihnm_introproc.cpp index becfdd0f49..588112b792 100644 --- a/engines/saga/ihnm_introproc.cpp +++ b/engines/saga/ihnm_introproc.cpp @@ -181,13 +181,14 @@ bool Scene::playTitle(int title, int time, int mode) { switch (phase) { case 0: // fadeout case 1: // fadeout 100% - case 3: // fadein - case 4: // fadein 100% case 7: // fadeout case 8: // fadeout 100% - if (phase == 0 || phase == 1 || phase == 7 || phase == 8) - _vm->_gfx->palToBlack(cur_pal, (double)(curTime - startTime) / kNormalFadeDuration); - else + _vm->_gfx->palToBlack(cur_pal, (double)(curTime - startTime) / kNormalFadeDuration); + // fall through + + case 3: // fadein + case 4: // fadein 100% + if (phase == 3 || phase == 4) _vm->_gfx->blackToPal(pal_cut, (double)(curTime - startTime) / kNormalFadeDuration); if (curTime - startTime > kNormalFadeDuration) { |