[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.705,1.706 string.cpp,1.323,1.324

[Max Horn]

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

Modified Files:
	scumm.cpp string.cpp 
Log Message:
Removing unneccessary checks again (say yay to preconditions that ensure _version > X :-)

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -d -r1.705 -r1.706
--- scumm.cpp	24 Jan 2006 03:31:14 -0000	1.705
+++ scumm.cpp	24 Jan 2006 07:20:15 -0000	1.706
@@ -2340,7 +2340,7 @@
 		VAR(VAR_TMR_1) += delta;
 		VAR(VAR_TMR_2) += delta;
 		VAR(VAR_TMR_3) += delta;
-		if ((_gameId == GID_ZAK && _platform == Common::kPlatformFMTowns) || _gameId == GID_INDY3) {
+		if (_gameId == GID_ZAK || _gameId == GID_INDY3) {
 			// All versions of Indy3 set three extra timers
 			// FM-TOWNS version of Zak sets three extra timers
 			VAR(39) += delta;

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- string.cpp	24 Jan 2006 03:46:22 -0000	1.323
+++ string.cpp	24 Jan 2006 07:20:15 -0000	1.324
@@ -578,7 +578,7 @@
 					// HE games which use sprites for subtitles
 				} else if (_heversion >= 60 && !ConfMan.getBool("subtitles") && _sound->isSoundRunning(1)) {
 					// Special case for HE games
-				} else if (_gameId == GID_LOOM && _version == 4 && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
+				} else if (_gameId == GID_LOOM && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
 					// Special case for Loom (CD), since it only uses CD audio.for sound
 				} else if (!ConfMan.getBool("subtitles") && (!_haveActorSpeechMsg || _mixer->isSoundHandleActive(_sound->_talkChannelHandle))) {
 					// Subtitles are turned off, and there is a voice version