[Scummvm-cvs-logs] scummvm master -> fb0788d12ffd4fedaa5019d47c547f538d25ff7c
bluegr
bluegr at gmail.com
Thu Nov 15 13:58:55 CET 2012
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fb0788d12f SCI: Properly reset the palVary signal when loading (bug #3575569)
Commit: fb0788d12ffd4fedaa5019d47c547f538d25ff7c
https://github.com/scummvm/scummvm/commit/fb0788d12ffd4fedaa5019d47c547f538d25ff7c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2012-11-15T04:57:55-08:00
Commit Message:
SCI: Properly reset the palVary signal when loading (bug #3575569)
Changed paths:
engines/sci/engine/savegame.cpp
engines/sci/graphics/palette.h
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 2a39f24..b2d95c5 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -696,8 +696,9 @@ void GfxPalette::saveLoadWithSerializer(Common::Serializer &s) {
s.syncAsSint32LE(_palVaryPaused);
}
+ _palVarySignal = 0;
+
if (s.isLoading() && _palVaryResourceId != -1) {
- _palVarySignal = 0;
palVaryInstallTimer();
}
}
@@ -878,10 +879,6 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
}
}
- // Remove the palVary effect timer, if there is one running currently.
- // Fixes bug #3575569.
- g_sci->_gfxPalette->palVaryRemoveTimer();
-
// We don't need the thumbnail here, so just read it and discard it
Graphics::skipThumbnail(*fh);
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h
index 1ca1f2d..e974781 100644
--- a/engines/sci/graphics/palette.h
+++ b/engines/sci/graphics/palette.h
@@ -105,8 +105,6 @@ public:
byte findMacIconBarColor(byte r, byte g, byte b);
bool colorIsFromMacClut(byte index);
- void palVaryRemoveTimer();
-
#ifdef ENABLE_SCI32
bool loadClut(uint16 clutId);
byte matchClutColor(uint16 color);
@@ -116,6 +114,7 @@ public:
private:
void palVaryInit();
void palVaryInstallTimer();
+ void palVaryRemoveTimer();
bool palVaryLoadTargetPalette(GuiResourceId resourceId);
static void palVaryCallback(void *refCon);
void palVaryIncreaseSignal();
More information about the Scummvm-git-logs
mailing list