Got rid of ScummEngine::_confirmExit, and some other minor cleanup

svn-id: r24319

8 files changed, 6 insertions, 14 deletions

diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 8b12dd191e..b83fde2838 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -50,6 +50,7 @@ SoundHE::SoundHE(ScummEngine *parent)
 	:
 	Sound(parent),
 	_vm((ScummEngine_v60he *)parent),
+	_overrideFreq(0),
 	_heMusic(0),
 	_heMusicTracks(0) {
 
diff --git a/engines/scumm/he/sound_he.h b/engines/scumm/he/sound_he.h
index 50f349863d..c0a26c7446 100644
--- a/engines/scumm/he/sound_he.h
+++ b/engines/scumm/he/sound_he.h
@@ -33,6 +33,8 @@ class SoundHE : public Sound {
 protected:
 	ScummEngine_v60he *_vm;
 
+	int _overrideFreq;
+
 	struct HEMusic {
 		int32 id;
 		int32 offset;
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index e041f62028..1ef03fa90c 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -182,7 +182,7 @@ void ScummEngine::parseEvents() {
 			break;
 
 		case OSystem::EVENT_QUIT:
-			if (_confirmExit)
+			if (ConfMan.getBool("confirm_exit"))
 				confirmExitDialog();
 			else
 				_quit = true;
diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index a6e8587a50..e59ddc179f 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -1282,7 +1282,7 @@ void ScummEngine_v8::o8_kernelSetFunctions() {
 		debug(0, "o8_kernelSetFunctions: paletteSetIntensity(%d, %d)", args[1], args[2]);
 		break;
 	case 34:	// queryQuit
-		if (_confirmExit)
+		if (ConfMan.getBool("confirm_exit"))
 			confirmExitDialog();
 		else
 			_quit = true;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index de8793dedc..19daa8f166 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -268,7 +268,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	_charsetBufPos = 0;
 	memset(_charsetBuffer, 0, sizeof(_charsetBuffer));
 	_copyProtection = false;
-	_confirmExit = false;
 	_voiceMode = 0;
 	_talkDelay = 0;
 	_NES_lastTalkingActor = 0;
@@ -455,10 +454,8 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	else
 		_voiceMode = ConfMan.getBool("subtitles");
 
-	_confirmExit = ConfMan.getBool("confirm_exit");
-
 	if (ConfMan.hasKey("render_mode")) {
-		_renderMode = Common::parseRenderMode(ConfMan.get("render_mode").c_str());
+		_renderMode = Common::parseRenderMode(ConfMan.get("render_mode"));
 	} else {
 		_renderMode = Common::kRenderDefault;
 	}
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 145acd794d..3eb76d173f 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -1132,7 +1132,6 @@ protected:
 	bool _enable_gs;
 	MidiDriverFlags _musicType;
 	bool _copyProtection;
-	bool _confirmExit;
 
 public:
 	uint16 _extraBoxFlags[65];
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 34b758f72a..1da644e1e9 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -74,7 +74,6 @@ Sound::Sound(ScummEngine *parent)
 	_mouthSyncMode(false),
 	_endOfMouthSync(false),
 	_curSoundPos(0),
-	_overrideFreq(0),
 	_currentCDSound(0),
 	_currentMusic(0),
 	_soundsPaused(false),
diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h
index 6459d8772d..83607d3dd3 100644
--- a/engines/scumm/sound.h
+++ b/engines/scumm/sound.h
@@ -27,10 +27,6 @@
 #include "sound/mixer.h"
 #include "scumm/saveload.h"
 
-namespace Common {
-	class File;
-}
-
 namespace Scumm {
 
 class ScummEngine;
@@ -79,8 +75,6 @@ protected:
 	uint16 _mouthSyncTimes[64];
 	uint _curSoundPos;
 
-	int _overrideFreq;
-
 	int16 _currentCDSound;
 	int16 _currentMusic;