From 747bc75bc724f6055c4140403eb60613777e245e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 3 Nov 2011 22:40:28 +0200
Subject: SCI: Fixed typo in colorIsFromMacClut()
---
engines/sci/graphics/palette.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'engines/sci/graphics/palette.cpp')
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index b52af38675..a7a5dc94d1 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -966,7 +966,7 @@ void GfxPalette::loadMacIconBarPalette() {
}
bool GfxPalette::colorIsFromMacClut(byte index) {
- return index != 0 && _macClut && (_macClut[index * 3] != 0 || _macClut[index * 3 + 1] != 0 || _macClut[index * 3 + 1] != 0);
+ return index != 0 && _macClut && (_macClut[index * 3] != 0 || _macClut[index * 3 + 1] != 0 || _macClut[index * 3 + 2] != 0);
}
#ifdef ENABLE_SCI32
--
cgit v1.2.3
From 5fc9831577858a15ee323b41a1b9e6d01c444118 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 17 Nov 2011 11:00:09 +0200
Subject: SCI: Fixed bug #3439240 - "QFG1VGA: Game Crashes While Sleeping at
Erana's Peace"
---
engines/sci/graphics/palette.cpp | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'engines/sci/graphics/palette.cpp')
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index a7a5dc94d1..b8a4248c93 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -709,6 +709,11 @@ bool GfxPalette::palVaryLoadTargetPalette(GuiResourceId resourceId) {
}
void GfxPalette::palVaryInstallTimer() {
+ // Remove any possible leftover palVary timer callbacks.
+ // This happens for example in QFG1VGA, when sleeping at Erana's place
+ // (bug #3439240).
+ palVaryRemoveTimer();
+
int16 ticks = _palVaryTicks > 0 ? _palVaryTicks : 1;
// Call signal increase every [ticks]
g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this, "sciPalette");
--
cgit v1.2.3
From ae54885379a040321ac8576be8db7848078ba616 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 17 Nov 2011 11:16:10 +0200
Subject: SCI: Updated information regarding bug #3439240
---
engines/sci/graphics/palette.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'engines/sci/graphics/palette.cpp')
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index b8a4248c93..47d1647c6c 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -711,7 +711,9 @@ bool GfxPalette::palVaryLoadTargetPalette(GuiResourceId resourceId) {
void GfxPalette::palVaryInstallTimer() {
// Remove any possible leftover palVary timer callbacks.
// This happens for example in QFG1VGA, when sleeping at Erana's place
- // (bug #3439240).
+ // (bug #3439240) - the nighttime to daytime effect clashes with the
+ // scene transition effect, as we load scene images too quickly for
+ // the SCI scripts in that case (also refer to kernelPalVaryInit).
palVaryRemoveTimer();
int16 ticks = _palVaryTicks > 0 ? _palVaryTicks : 1;
--
cgit v1.2.3