[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.144,1.145 scumm.h,1.371,1.372 scummvm.cpp,2.583,2.584 vars.cpp,1.76,1.77

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11060/scumm

Modified Files:
	saveload.cpp scumm.h scummvm.cpp vars.cpp 
Log Message:

Enable and use VAR_VOICE_MODE


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- saveload.cpp	21 Feb 2004 08:21:11 -0000	1.144
+++ saveload.cpp	22 Feb 2004 03:08:13 -0000	1.145
@@ -200,6 +200,10 @@
 		_scummVars[VAR_CAMERA_ACCEL_Y] = _scummVars[110];
 	}
 
+	// Sync with current config setting
+	if (_version >= 7)
+		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
+
 	// We could simply dirty colours 0-15 for 16-colour games -- nowadays
 	// they handle their palette pretty much like the more recent games
 	// anyway. There was a time, though, when re-initializing was necessary

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -d -r1.371 -r1.372
--- scumm.h	20 Feb 2004 15:04:51 -0000	1.371
+++ scumm.h	22 Feb 2004 03:08:14 -0000	1.372
@@ -1223,6 +1223,7 @@
 	byte VAR_CLICK_AREA;
 
 	byte VAR_BLAST_ABOVE_TEXT;
+	byte VAR_VOICE_MODE;
 };
 
 // This is a constant lookup table of reverse bit masks

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.583
retrieving revision 2.584
diff -u -d -r2.583 -r2.584
--- scummvm.cpp	21 Feb 2004 15:08:36 -0000	2.583
+++ scummvm.cpp	22 Feb 2004 03:08:16 -0000	2.584
@@ -618,6 +618,7 @@
 	VAR_CLICK_AREA = 0xFF;
 
 	VAR_BLAST_ABOVE_TEXT = 0xFF;
+	VAR_VOICE_MODE = 0xFF;
 
 	// Use g_scumm from error() ONLY
 	g_scumm = this;
@@ -1200,6 +1201,9 @@
 		VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen;
 	}
 	
+	if (_version >= 7)
+		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
+
 	VAR(VAR_CHARINC) = 4;
 	talkingActor(0);
 }

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- vars.cpp	21 Feb 2004 13:10:44 -0000	1.76
+++ vars.cpp	22 Feb 2004 03:08:18 -0000	1.77
@@ -194,7 +194,7 @@
 	VAR_PERFORMANCE_2 = 27;
 	VAR_GAME_LOADED = 29;
 	VAR_V6_EMSSPACE = 32;
-	//VAR_VOICE_MODE = 33; // 0 is voice, 1 is voice+text, 2 is text only
+	VAR_VOICE_MODE = 33; // 0 is voice, 1 is voice+text, 2 is text only
 	VAR_RANDOM_NR = 34;
 	VAR_NEW_ROOM = 35;
 	VAR_WALKTO_OBJ = 36;
@@ -292,7 +292,7 @@
 	VAR_NEW_ROOM = 32;
 	VAR_WALKTO_OBJ = 33;
 
-	//VAR_VOICE_MODE = 39; // 0 is voice, 1 is voice+text, 2 is text only
+	VAR_VOICE_MODE = 39; // 0 is voice, 1 is voice+text, 2 is text only
 	VAR_GAME_LOADED = 40;
 	VAR_LANGUAGE = 41;