diff options
| author | Nicola Mettifogo | 2007-05-13 12:39:32 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-05-13 12:39:32 +0000 |
| commit | 887fa2f7605393bdcac3af718e915d10bd9e2e2c (patch) | |
| tree | b880e4c35570c135570c01219b1526a16508da8c | |
| parent | e9d038a423ddcd803bd0b63fe163c749426c4acd (diff) | |
| download | scummvm-rg350-887fa2f7605393bdcac3af718e915d10bd9e2e2c.tar.gz scummvm-rg350-887fa2f7605393bdcac3af718e915d10bd9e2e2c.tar.bz2 scummvm-rg350-887fa2f7605393bdcac3af718e915d10bd9e2e2c.zip | |
Fixed timings when showing credits.
svn-id: r26830
| -rw-r--r-- | engines/parallaction/callables.cpp | 4 | ||||
| -rw-r--r-- | engines/parallaction/intro.cpp | 20 | ||||
| -rw-r--r-- | engines/parallaction/staticres.cpp | 3 |
3 files changed, 17 insertions, 10 deletions
diff --git a/engines/parallaction/callables.cpp b/engines/parallaction/callables.cpp index a9aaef88ea..647e686636 100644 --- a/engines/parallaction/callables.cpp +++ b/engines/parallaction/callables.cpp @@ -76,9 +76,9 @@ void _c_fade(void *parm) { for (uint16 _di = 0; _di < 64; _di++) { _vm->_gfx->fadePalette(pal); _vm->_gfx->setPalette(pal); - } - _vm->waitTime( 1 ); + _vm->waitTime( 1 ); + } return; } diff --git a/engines/parallaction/intro.cpp b/engines/parallaction/intro.cpp index f4fc55658d..3e8ffc421a 100644 --- a/engines/parallaction/intro.cpp +++ b/engines/parallaction/intro.cpp @@ -142,26 +142,34 @@ void _c_endIntro(void *parm) { _vm->_gfx->setFont(kFontMenu); - for (uint16 _si = 0; _si < 7; _si++) { + debugC(1, kDebugLocation, "endIntro()"); + + for (uint16 _si = 0; _si < 6; _si++) { _vm->_gfx->displayCenteredString(80, _credits[_si]._role); _vm->_gfx->displayCenteredString(100, _credits[_si]._name); _vm->_gfx->updateScreen(); for (uint16 v2 = 0; v2 < 100; v2++) { + _mouseButtons = kMouseNone; _vm->updateInput(); - if (_mouseButtons != kMouseLeftUp) - _vm->waitTime( 1 ); + if (_mouseButtons == kMouseLeftUp) + break; + + _vm->waitTime( 1 ); } _vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront); } + debugC(1, kDebugLocation, "endIntro(): done showing credits"); + + _vm->_gfx->displayCenteredString(80, "CLICK MOUSE BUTTON TO START"); + _vm->_gfx->updateScreen(); + waitUntilLeftClick(); - if (_vm->getFeatures() & GF_DEMO) { - _engineFlags |= kEngineQuit; - } else { + if ((_vm->getFeatures() & GF_DEMO) == 0) { _engineFlags &= ~kEngineMouse; _vm->_menu->selectCharacter(); } diff --git a/engines/parallaction/staticres.cpp b/engines/parallaction/staticres.cpp index 28e1260fda..9d0eb33848 100644 --- a/engines/parallaction/staticres.cpp +++ b/engines/parallaction/staticres.cpp @@ -369,8 +369,7 @@ Credit _credits[] = { {"Project Manager", "LOVRANO CANEPA"}, {"Production", "BRUNO BOZ"}, {"Special Thanks to", "LUIGI BENEDICENTI - GILDA and DANILO"}, - {"Copyright 1992 Euclidea s.r.l ITALY", "All rights reserved"}, - {"CLICK MOUSE BUTTON TO START", 0} + {"Copyright 1992 Euclidea s.r.l ITALY", "All rights reserved"} }; const char *_dinoName = "dino"; |