[Scummvm-cvs-logs] CVS: scummvm/scumm/smush insane.cpp,1.26,1.27 insane.h,1.14,1.15 smush_player.cpp,1.91,1.92 smush_player.h,1.18,1.19

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv2939/smush

Modified Files:
	insane.cpp insane.h smush_player.cpp smush_player.h 
Log Message:
get rid of _noSubtitles, use ConfigManager directly instead; clean up some IMuseDigital oddities

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- insane.cpp	25 Dec 2003 13:56:22 -0000	1.26
+++ insane.cpp	27 Dec 2003 15:22:59 -0000	1.27
@@ -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 @@
 	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 @@
 	//	  ptrMainLoop = &ptrMainLoopBody;
 
 	_insaneIsRunning = true;
-	_player = new SmushPlayer(_scumm, _speed, _subtitles);
+	_player = new SmushPlayer(_scumm, _speed);
 	_player->insanity(true);
 
 	_numberArray = arraynum;
@@ -3501,7 +3500,7 @@
 	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);

Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- insane.h	21 Dec 2003 19:01:39 -0000	1.14
+++ insane.h	27 Dec 2003 15:22:59 -0000	1.15
@@ -58,7 +58,7 @@
 	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 @@
 	SmushPlayer *_player;
 	
 	int32 _speed;
-	bool _subtitles;
 	bool _insaneIsRunning;
 	
 	int32 _numberArray;

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- smush_player.cpp	27 Dec 2003 14:03:07 -0000	1.91
+++ smush_player.cpp	27 Dec 2003 15:22:59 -0000	1.92
@@ -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 @@
 	((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 @@
 	_frameBuffer = NULL;
 	
 	_skipNext = false;
-	_subtitles = subtitles;
+	_subtitles = ConfMan.getBool("subtitles");
 	_dst = NULL;
 	_storeFrame = false;
 	_width = 0;

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- smush_player.h	25 Dec 2003 10:38:55 -0000	1.18
+++ smush_player.h	27 Dec 2003 15:22:59 -0000	1.19
@@ -71,7 +71,7 @@
 	bool _middleAudio;
 
 public:
-	SmushPlayer(ScummEngine *, int, bool);
+	SmushPlayer(ScummEngine *scumm, int speed);
 	~SmushPlayer();
 
 	void play(const char *filename, const char *directory);