aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-04-09 14:45:13 +1000
committerPaul Gilbert2011-04-09 14:45:13 +1000
commita79ba2b4f4ef069f9400a18505be8a29da2d0228 (patch)
tree39fceb600210e5b887416f7d88bc5ad6ce119eec
parentd10453d162d87237636502ed918d19c9d8211969 (diff)
downloadscummvm-rg350-a79ba2b4f4ef069f9400a18505be8a29da2d0228.tar.gz
scummvm-rg350-a79ba2b4f4ef069f9400a18505be8a29da2d0228.tar.bz2
scummvm-rg350-a79ba2b4f4ef069f9400a18505be8a29da2d0228.zip
TSAGE: Corrections to palette rotation
-rw-r--r--engines/tsage/core.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 966eed7902..7a461d2496 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1064,7 +1064,7 @@ void PaletteRotation::signal() {
uint32 frameNumber = _globals->_events.getFrameNumber();
if (frameNumber >= _frameNumber) {
- _delayCtr -= frameNumber - _frameNumber;
+ _delayCtr = frameNumber - _frameNumber;
_frameNumber = frameNumber;
if (_delayCtr < 0)
@@ -1078,7 +1078,8 @@ void PaletteRotation::signal() {
if (_disabled)
return;
- bool flag = true; switch (_rotationMode) {
+ bool flag = true;
+ switch (_rotationMode) {
case -1:
if (--_currIndex < _start) {
flag = decDuration();
@@ -1119,7 +1120,7 @@ void PaletteRotation::signal() {
g_system->getPaletteManager()->setPalette((const byte *)&_palette[_currIndex], _start, count);
if (count2) {
- g_system->getPaletteManager()->setPalette((const byte *)&_palette[_start], _start, count2);
+ g_system->getPaletteManager()->setPalette((const byte *)&_palette[_start], _start + count, count2);
}
}
}