diff options
| author | Travis Howell | 2005-05-21 15:45:09 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-21 15:45:09 +0000 |
| commit | 0b1094ef045be590b66c5e1e530fc29ab1969785 (patch) | |
| tree | 15a3e2d004ec0a061d59b4dbc97485bcafd6ca59 /scumm/saveload.cpp | |
| parent | 30408308bc1ec8abd194c8913d3ad07dcba8559f (diff) | |
| download | scummvm-rg350-0b1094ef045be590b66c5e1e530fc29ab1969785.tar.gz scummvm-rg350-0b1094ef045be590b66c5e1e530fc29ab1969785.tar.bz2 scummvm-rg350-0b1094ef045be590b66c5e1e530fc29ab1969785.zip | |
Add patch from cyx for:
1094340 - COMI: Frightening the gravedigger, he goes white.
905833 - COMI: Palette in Theater controls
svn-id: r18211
Diffstat (limited to 'scumm/saveload.cpp')
| -rw-r--r-- | scumm/saveload.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 1e3256fed9..5f541d0b71 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -605,6 +605,7 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { MK_OBSOLETE(ScummEngine, gdi._transparentColor, sleByte, VER(8), VER(50)), MKARRAY(ScummEngine, _currentPalette[0], sleByte, 768, VER(8)), + MKARRAY(ScummEngine, _darkenPalette[0], sleByte, 768, VER(53)), // Sam & Max specific palette replaced by _shadowPalette now. MK_OBSOLETE_ARRAY(ScummEngine, _proc_special_palette[0], sleByte, 256, VER(8), VER(33)), @@ -915,6 +916,11 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { s->saveLoadArrayOf(_palManipPalette, 0x300, 1, sleByte); s->saveLoadArrayOf(_palManipIntermediatePal, 0x600, 1, sleByte); } + + // darkenPalette was not saved before V53 + if (s->isLoading() && savegameVersion < VER(53)) { + memcpy(_darkenPalette, _currentPalette, 768); + } // |