diff options
| author | Johannes Schickel | 2009-02-17 17:17:47 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-02-17 17:17:47 +0000 |
| commit | 33934251cbd5ce7f4db3e5e44fd7ae2741233093 (patch) | |
| tree | e3739cd620ad02747103de56adce0d23f28957d2 /engines/kyra | |
| parent | b3cf9ef9a946571bb31d826384cb68a49bcc8820 (diff) | |
| download | scummvm-rg350-33934251cbd5ce7f4db3e5e44fd7ae2741233093.tar.gz scummvm-rg350-33934251cbd5ce7f4db3e5e44fd7ae2741233093.tar.bz2 scummvm-rg350-33934251cbd5ce7f4db3e5e44fd7ae2741233093.zip | |
Fix for long delay while fading palette in Zanthia's home, when mixing potions.
svn-id: r38425
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/screen.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index cd2227f130..71d49a7aae 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -422,10 +422,9 @@ void Screen::getFadeParams(const uint8 *palette, int delay, int &delayInc, int & maxDiff = MAX<uint8>(maxDiff, diff); } - delayInc = delay << 8; + delayInc = (delay << 8) & 0x7FFF; if (maxDiff != 0) delayInc /= maxDiff; - delayInc &= 0x7FFF; delay = delayInc; for (diff = 1; diff <= maxDiff; ++diff) { |