[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.577.2.10,2.577.2.11

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	scummvm.cpp 
Log Message:

Commited too much.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.10
retrieving revision 2.577.2.11
diff -u -d -r2.577.2.10 -r2.577.2.11
--- scummvm.cpp	3 May 2004 02:04:57 -0000	2.577.2.10
+++ scummvm.cpp	3 May 2004 02:08:13 -0000	2.577.2.11
@@ -620,8 +620,6 @@
 	VAR_VERB_ALLOWED = 0xFF;
 	VAR_CLICK_AREA = 0xFF;
 
-	VAR_VOICE_MODE = 0xFF;
-
 	// Use g_scumm from error() ONLY
 	g_scumm = this;
 
@@ -1221,9 +1219,6 @@
 	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
 		_scummVars[74] = 1225;
 	
-	if (_version == 7)
-		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
-
 	VAR(VAR_CHARINC) = 4;
 	setTalkingActor(0);
 }