From 7d6bc98516aeacf38b52d973f542adf2f07fc796 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 24 Jan 2006 07:20:15 +0000
Subject: Removing unneccessary checks again (say yay to preconditions that
 ensure _version > X :-)

svn-id: r20157
---
 scumm/scumm.cpp  | 2 +-
 scumm/string.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 28105e4421..bb220853af 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2340,7 +2340,7 @@ int ScummEngine::scummLoop(int delta) {
 		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;
diff --git a/scumm/string.cpp b/scumm/string.cpp
index e9223db4ab..5a83dbed77 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -578,7 +578,7 @@ void ScummEngine::CHARSET_1() {
 					// 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
-- 
cgit v1.2.3