aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-08-04 10:16:26 -0400
committerPaul Gilbert2013-08-04 10:16:26 -0400
commit0d2f81238720bef663f96942b2036e1e59e1f689 (patch)
tree188f150dc0396550f7f3b45aa7353568b4cec0fc
parentc92ffa95df999265f5a63d9e0f7843c97040643e (diff)
downloadscummvm-rg350-0d2f81238720bef663f96942b2036e1e59e1f689.tar.gz
scummvm-rg350-0d2f81238720bef663f96942b2036e1e59e1f689.tar.bz2
scummvm-rg350-0d2f81238720bef663f96942b2036e1e59e1f689.zip
TSAGE: Bugfixes for further R2R scene 1000 cutscenes
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index fa24658586..8d165fba07 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -146,12 +146,12 @@ void Scene1000::signal() {
case 2:
if (R2_GLOBALS._speechSubtitles & SPEECH_TEXT) {
- setAction(&_sequenceManager1, this, &R2_GLOBALS._player, NULL);
+ setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL);
} else {
if (++_field412 < 3)
_sceneMode = 2;
- setAction(&_sequenceManager1, this, &R2_GLOBALS._player, NULL);
+ setAction(&_sequenceManager1, this, 2, &R2_GLOBALS._player, NULL);
}
break;
@@ -162,7 +162,7 @@ void Scene1000::signal() {
R2_GLOBALS._fontColors.background = 224;
R2_GLOBALS._fontColors.foreground = 119;
- for (int percent = 100; percent >= 0; percent += 5)
+ for (int percent = 100; percent >= 0; percent -= 5)
R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
_animationPlayer._paletteMode = ANIMPALMODE_NONE;
@@ -285,7 +285,7 @@ void Scene1000::signal() {
case 50:
R2_GLOBALS._sound2.play(306);
- for (int percent = 100; percent >= 0; percent += 5)
+ for (int percent = 100; percent >= 0; percent -= 5)
R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
_animationPlayer._paletteMode = ANIMPALMODE_NONE;
@@ -307,7 +307,7 @@ void Scene1000::signal() {
R2_GLOBALS._sound2.play(307);
R2_GLOBALS._sound1.play(308);
- for (int percent = 100; percent >= 0; percent += 5)
+ for (int percent = 100; percent >= 0; percent -= 5)
R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
_animationPlayer._paletteMode = ANIMPALMODE_NONE;
@@ -334,7 +334,7 @@ void Scene1000::signal() {
case 60:
R2_GLOBALS._sound1.play(333);
- for (int percent = 100; percent >= 0; percent += 5)
+ for (int percent = 100; percent >= 0; percent -= 5)
R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
_animationPlayer._paletteMode = ANIMPALMODE_NONE;
@@ -359,7 +359,7 @@ void Scene1000::signal() {
case 70:
R2_GLOBALS._sound2.play(113);
- for (int percent = 100; percent >= 0; percent += 5)
+ for (int percent = 100; percent >= 0; percent -= 5)
R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
_animationPlayer._paletteMode = ANIMPALMODE_NONE;