aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-20 16:18:29 +0000
committerMartin Kiewitz2009-10-20 16:18:29 +0000
commit907134076d81294753ac32cbfda23f5a2d4d0d64 (patch)
treec98f8094a7498c13175a6bbdce35ef741605c39e /engines
parent361977e7ed074ab0a099360ef58a0bf5a8b5182a (diff)
downloadscummvm-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')
-rw-r--r--engines/sci/engine/kgraphics.cpp2
-rw-r--r--engines/sci/gui/gui.cpp2
-rw-r--r--engines/sci/gui/gui.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 677b59db0f..af84cbbbcf 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -602,7 +602,7 @@ reg_t kPalette(EngineState *s, int argc, reg_t *argv) {
case 4: {
uint16 fromColor = argv[1].toUint16();
uint16 toColor = argv[2].toUint16();
- uint16 speed = argv[3].toSint16();
+ int16 speed = argv[3].toSint16();
s->_gui->paletteAnimate(fromColor, toColor, speed);
break;
}
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);