From a9c2e6ecbfdc6be61c86e6ac9cb05e232f7e7d43 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 25 Mar 2005 22:11:08 +0000
Subject: MM NES fixes:   o Fixed crash when in-game GUI was displayed   o
 Support for save/load   o Savegame version bumped

svn-id: r17232
---
 scumm/saveload.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'scumm/saveload.cpp')

diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index de39f67cb6..e998ecdd33 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -248,7 +248,10 @@ bool ScummEngine::loadState(int slot, bool compat) {
 	// ever add options for using different 16-colour palettes.
 	if (_version == 1) {
 		if (_gameId == GID_MANIAC)
-			setupV1ManiacPalette();
+			if (_features & GF_NES)
+				setupNESPalette();
+			else
+				setupV1ManiacPalette();
 		else
 			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
@@ -296,6 +299,7 @@ bool ScummEngine::loadState(int slot, bool compat) {
 
 	// Restore the virtual screens and force a fade to black.
 	initScreens(kMainVirtScreen, _screenHeight);
+
 	VirtScreen *vs = &virtscr[kMainVirtScreen];
 	memset(vs->getPixels(0, 0), 0, vs->pitch * vs->h);
 	vs->setDirtyRange(0, vs->h);
@@ -594,6 +598,8 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 		MKLINE(ScummEngine, _screenB, sleUint16, VER(8)),
 		MKLINE(ScummEngine, _screenH, sleUint16, VER(8)),
 
+		MKLINE(ScummEngine, _NESCostumeSet, sleUint16, VER(47)),
+
 		MK_OBSOLETE(ScummEngine, _cd_track, sleInt16, VER(9), VER(9)),
 		MK_OBSOLETE(ScummEngine, _cd_loops, sleInt16, VER(9), VER(9)),
 		MK_OBSOLETE(ScummEngine, _cd_frame, sleInt16, VER(9), VER(9)),
@@ -746,6 +752,12 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 		}
 	}
 
+	if (_features & GF_NES)
+		if (savegameVersion < VER(47))
+			NES_loadCostumeSet(_NESCostumeSet = 0);
+		else
+			NES_loadCostumeSet(_NESCostumeSet);
+
 	if (_heversion >= 71) {
 		Wiz *wiz = &((ScummEngine_v70he *)this)->_wiz;
 		s->saveLoadArrayOf(wiz->_polygons, ARRAYSIZE(wiz->_polygons), sizeof(wiz->_polygons[0]), polygonEntries);
-- 
cgit v1.2.3