get rid of _noSubtitles, use ConfigManager directly instead; clean up some IMuseDigital oddities

svn-id: r11966

4 files changed, 9 insertions, 10 deletions

diff --git a/scumm/smush/insane.cpp b/scumm/smush/insane.cpp
index 8486ef714c..7347c91a6c 100644
--- a/scumm/smush/insane.cpp
+++ b/scumm/smush/insane.cpp
@@ -24,6 +24,7 @@
 
 #include "base/engine.h"
 
+#include "common/config-manager.h"
 #include "common/file.h"
 
 #include "scumm/scumm.h"
@@ -106,16 +107,14 @@ Insane::~Insane(void) {
 	delete _smush_icons2Nut;
 }
 
-void Insane::setSmushParams(int speed, bool subtitles) {
+void Insane::setSmushParams(int speed) {
 	_speed = speed;
-	_subtitles = subtitles;
 }
 
 void Insane::initvars(void) {
 	int i, j;
 
 	_speed = 12;
-	_subtitles = true;
 	_insaneIsRunning = false;
 
 	_numberArray = 0;
@@ -1859,7 +1858,7 @@ void Insane::runScene(int arraynum) {
 	//	  ptrMainLoop = &ptrMainLoopBody;
 
 	_insaneIsRunning = true;
-	_player = new SmushPlayer(_scumm, _speed, _subtitles);
+	_player = new SmushPlayer(_scumm, _speed);
 	_player->insanity(true);
 
 	_numberArray = arraynum;
@@ -3501,7 +3500,7 @@ void Insane::postCaseAll(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 	if (tsceneProp->actor != -1) {
 		if (_actor[tsceneProp->actor].field_54) {
 			tsceneProp->counter++;
-			if (!_actor[tsceneProp->actor].runningSound || !_scumm->_noSubtitles) {
+			if (!_actor[tsceneProp->actor].runningSound || ConfMan.getBool("subtitles")) {
 				if (_actor[tsceneProp->actor].act[3].state == 72 &&
 					_currTrsMsg) {
 					smush_setPaletteValue(1, tsceneProp->r, tsceneProp->g, tsceneProp->b);
diff --git a/scumm/smush/insane.h b/scumm/smush/insane.h
index 0c215d75f3..02aab9c779 100644
--- a/scumm/smush/insane.h
+++ b/scumm/smush/insane.h
@@ -58,7 +58,7 @@ class Insane {
 	Insane(ScummEngine *scumm);
 	~Insane();
 
-	void setSmushParams(int speed, bool subtitles);
+	void setSmushParams(int speed);
 	void runScene(int arraynum);
 
 	void procPreRendering(void);
@@ -75,7 +75,6 @@ class Insane {
 	SmushPlayer *_player;
 	
 	int32 _speed;
-	bool _subtitles;
 	bool _insaneIsRunning;
 	
 	int32 _numberArray;
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 980668556a..45b6280df4 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -23,6 +23,7 @@
 
 #include "base/engine.h"
 
+#include "common/config-manager.h"
 #include "common/file.h"
 #include "common/util.h"
 #include "common/timer.h"
@@ -209,7 +210,7 @@ void SmushPlayer::timerCallback(void *refCon) {
 	((SmushPlayer *)refCon)->parseNextFrame();
 }
 
-SmushPlayer::SmushPlayer(ScummEngine *scumm, int speed, bool subtitles) {
+SmushPlayer::SmushPlayer(ScummEngine *scumm, int speed) {
 	_scumm = scumm;
 	_version = -1;
 	_nbframes = 0;
@@ -224,7 +225,7 @@ SmushPlayer::SmushPlayer(ScummEngine *scumm, int speed, bool subtitles) {
 	_frameBuffer = NULL;
 	
 	_skipNext = false;
-	_subtitles = subtitles;
+	_subtitles = ConfMan.getBool("subtitles");
 	_dst = NULL;
 	_storeFrame = false;
 	_width = 0;
diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h
index 12a86a01a9..d45f5446ca 100644
--- a/scumm/smush/smush_player.h
+++ b/scumm/smush/smush_player.h
@@ -71,7 +71,7 @@ private:
 	bool _middleAudio;
 
 public:
-	SmushPlayer(ScummEngine *, int, bool);
+	SmushPlayer(ScummEngine *scumm, int speed);
 	~SmushPlayer();
 
 	void play(const char *filename, const char *directory);