diff options
| author | Strangerke | 2013-02-12 08:34:49 +0100 |
|---|---|---|
| committer | Strangerke | 2013-02-12 08:34:49 +0100 |
| commit | e47d34f9512bb9b0124bc61547bd854563ac53d2 (patch) | |
| tree | 9ea2905c9d9ff0a0afc34f3da18f4533567eaf60 | |
| parent | 2634c65d2ff4a83f745e9c204372991472eebb30 (diff) | |
| download | scummvm-rg350-e47d34f9512bb9b0124bc61547bd854563ac53d2.tar.gz scummvm-rg350-e47d34f9512bb9b0124bc61547bd854563ac53d2.tar.bz2 scummvm-rg350-e47d34f9512bb9b0124bc61547bd854563ac53d2.zip | |
HOPKINS: Fix transition glitch when skipping animations
| -rw-r--r-- | engines/hopkins/graphics.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 221558f592..6834d400fc 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -570,13 +570,8 @@ void GraphicsManager::fadeIn(const byte *palette, int step, const byte *surface) */ void GraphicsManager::fadeOut(const byte *palette, int step, const byte *surface) { byte palData[PALETTE_BLOCK_SIZE]; - int fadeStep; - if (step > 1) - fadeStep = step; - else - fadeStep = 2; - - if (palette) { + if ((step > 1) && (palette) && (!_vm->_eventsManager._escKeyFl)) { + int fadeStep = step; for (int fadeIndex = 0; fadeIndex < fadeStep; fadeIndex++) { for (int palOffset = 0; palOffset < PALETTE_BLOCK_SIZE; palOffset += 3) { palData[palOffset + 0] = (fadeStep - fadeIndex - 1) * palette[palOffset + 0] / (fadeStep - 1); |