diff options
| author | Matthew Stewart | 2018-07-17 20:49:59 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 639c02b76f591fe17ee78b6a72da46c4782fd4d5 (patch) | |
| tree | d850a636fda0dbaf945a31c56660d3eedcdfab45 /engines/startrek/graphics.cpp | |
| parent | 52cfe602712ad39174379d56e1b45b7121fefda6 (diff) | |
| download | scummvm-rg350-639c02b76f591fe17ee78b6a72da46c4782fd4d5.tar.gz scummvm-rg350-639c02b76f591fe17ee78b6a72da46c4782fd4d5.tar.bz2 scummvm-rg350-639c02b76f591fe17ee78b6a72da46c4782fd4d5.zip | |
STARTREK: Fix sound, support MT32.
Also jump to the first mission after the intro.
Diffstat (limited to 'engines/startrek/graphics.cpp')
| -rw-r--r-- | engines/startrek/graphics.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/engines/startrek/graphics.cpp b/engines/startrek/graphics.cpp index 9b1801b47f..6fe1c8f9ba 100644 --- a/engines/startrek/graphics.cpp +++ b/engines/startrek/graphics.cpp @@ -134,11 +134,7 @@ void Graphics::loadPalette(const Common::String &paletteName) { void Graphics::fadeinScreen() { while (_paletteFadeLevel <= 100) { TrekEvent event; - do { - if (!_vm->popNextEvent(&event)) - continue; - } - while (event.type != TREKEVENT_TICK); + _vm->waitForNextTick(); setPaletteFadeLevel(_palData, _paletteFadeLevel); _paletteFadeLevel += 10; @@ -150,11 +146,7 @@ void Graphics::fadeinScreen() { void Graphics::fadeoutScreen() { while (_paletteFadeLevel >= 0) { TrekEvent event; - do { - if (!_vm->popNextEvent(&event)) - continue; - } - while (event.type != TREKEVENT_TICK); + _vm->waitForNextTick(); setPaletteFadeLevel(_palData, _paletteFadeLevel); _paletteFadeLevel -= 10; |