From e47d34f9512bb9b0124bc61547bd854563ac53d2 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 12 Feb 2013 08:34:49 +0100 Subject: [PATCH] HOPKINS: Fix transition glitch when skipping animations --- engines/hopkins/graphics.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 221558f5923..6834d400fca 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);