diff options
author | Martin Kiewitz | 2009-10-20 16:18:29 +0000 |
---|---|---|
committer | Martin Kiewitz | 2009-10-20 16:18:29 +0000 |
commit | 907134076d81294753ac32cbfda23f5a2d4d0d64 (patch) | |
tree | c98f8094a7498c13175a6bbdce35ef741605c39e /engines/sci/gui | |
parent | 361977e7ed074ab0a099360ef58a0bf5a8b5182a (diff) | |
download | scummvm-rg350-907134076d81294753ac32cbfda23f5a2d4d0d64.tar.gz scummvm-rg350-907134076d81294753ac32cbfda23f5a2d4d0d64.tar.bz2 scummvm-rg350-907134076d81294753ac32cbfda23f5a2d4d0d64.zip |
SCI/newgui: kPalette/animate - accidentally changed speed to uint16 in prev. revision although its signed
svn-id: r45274
Diffstat (limited to 'engines/sci/gui')
-rw-r--r-- | engines/sci/gui/gui.cpp | 2 | ||||
-rw-r--r-- | engines/sci/gui/gui.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index a4d4dac4e1..c2e7a17f06 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -469,7 +469,7 @@ void SciGui::paletteSetIntensity(uint16 fromColor, uint16 toColor, uint16 intens _palette->setIntensity(fromColor, toColor, intensity, setPalette); } -void SciGui::paletteAnimate(uint16 fromColor, uint16 toColor, uint16 speed) { +void SciGui::paletteAnimate(uint16 fromColor, uint16 toColor, int16 speed) { // we are also called on Amiga as well, but for colors above 32, so it doesnt make sense if (!_s->resMan->isVGA()) return; diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h index 697edf976d..ba6d8b7ff9 100644 --- a/engines/sci/gui/gui.h +++ b/engines/sci/gui/gui.h @@ -103,7 +103,7 @@ public: virtual void paletteSet(GuiResourceId resourceNo, uint16 flags); virtual int16 paletteFind(uint16 r, uint16 g, uint16 b); virtual void paletteSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity, bool setPalette); - virtual void paletteAnimate(uint16 fromColor, uint16 toColor, uint16 speed); + virtual void paletteAnimate(uint16 fromColor, uint16 toColor, int16 speed); virtual void shakeScreen(uint16 shakeCount, uint16 directions); |