SUPERNOVA: Fix several issues with savegames

1 files changed, 12 insertions, 1 deletions

diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index 923b8d6bc5..80a8404599 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -982,7 +982,8 @@ Common::Error SupernovaEngine::loadGameState(int slot) {
 }
 
 bool SupernovaEngine::canSaveGameStateCurrently() {
-	return _allowSaveGame;
+	// Do not allow saving when either _allowSaveGame, _animationEnabled or _guiEnabled is false
+	return _allowSaveGame && _gm->_animationEnabled && _gm->_guiEnabled;
 }
 
 Common::Error SupernovaEngine::saveGameState(int slot, const Common::String &desc) {
@@ -1024,6 +1025,13 @@ bool SupernovaEngine::loadGame(int slot) {
 	Graphics::skipThumbnail(*savefile);
 	_gm->deserialize(savefile, saveVersion);
 
+	if (saveVersion >= 5) {
+		_menuBrightness = savefile->readByte();
+		_brightness = savefile->readByte();
+	} else {
+		_menuBrightness = _brightness = 255;
+	}
+
 	delete savefile;
 
 	return true;
@@ -1054,6 +1062,9 @@ bool SupernovaEngine::saveGame(int slot, const Common::String &description) {
 	Graphics::saveThumbnail(*savefile);
 	_gm->serialize(savefile);
 
+	savefile->writeByte(_menuBrightness);
+	savefile->writeByte(_brightness);
+
 	savefile->finalize();
 	delete savefile;