From 9fe1aaa9215e2ca540c859f2647629453a9f70d6 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 31 Jan 2004 22:12:35 +0000
Subject: renamed _saveLoadCompatible to _saveTemporaryState; make use of
 requestLoad/requestSave

svn-id: r12691
---
 scumm/saveload.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scumm/saveload.cpp')

diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 0d5e272159..424f1c07d7 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -49,9 +49,9 @@ struct SaveGameHeader {
 };
 
 
-void ScummEngine::requestSave(int slot, const char *name) {
+void ScummEngine::requestSave(int slot, const char *name, bool compatible) {
 	_saveLoadSlot = slot;
-	_saveLoadCompatible = false;
+	_saveTemporaryState = compatible;
 	_saveLoadFlag = 1;		// 1 for save
 	assert(name);
 	strcpy(_saveLoadName, name);
@@ -59,7 +59,7 @@ void ScummEngine::requestSave(int slot, const char *name) {
 
 void ScummEngine::requestLoad(int slot) {
 	_saveLoadSlot = slot;
-	_saveLoadCompatible = false;
+	_saveTemporaryState = false;
 	_saveLoadFlag = 2;		// 2 for load
 }
 
@@ -136,7 +136,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) {
 	// If we don't have iMUSE at all we may as well stop the sounds. The previous
 	// default behavior here was to stopAllSounds on all state restores.
 
-	if (!_imuse || _saveSound || !_saveLoadCompatible)
+	if (!_imuse || _saveSound || !_saveTemporaryState)
 		_sound->stopAllSounds();
 
 	_sound->stopCD();
@@ -767,7 +767,7 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 			AudioCD.play(info.track, info.numLoops, info.start, info.duration);
 	}
 
-	if (_imuse && (_saveSound || !_saveLoadCompatible)) {
+	if (_imuse && (_saveSound || !_saveTemporaryState)) {
 		_imuse->save_or_load(s, this);
 		_imuse->setMasterVolume(ConfMan.getInt("master_volume"));
 		_imuse->set_music_volume(ConfMan.getInt("music_volume"));
-- 
cgit v1.2.3