Fix regressions in earliest HE games again.

Remove pointless scumm var reset to zero.

svn-id: r19956

3 files changed, 11 insertions, 21 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index 47e2266e40..668c1ba7ed 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -793,8 +793,6 @@ protected:
 	virtual void executeOpcode(byte i);
 	virtual const char *getOpcodeDesc(byte i);
 
-	virtual void initScummVars();
-
 	virtual void saveOrLoad(Serializer *s);
 
 	void localizeArray(int slot, byte scriptSlot);
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index a894242566..f79b768154 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1087,7 +1087,7 @@ void ScummEngine_v6::o6_startSound() {
 	// In Fatty Bear's Birthday Surprise the piano uses offsets 1 - 23 to
 	// indicate which note to play, but only when using the standard piano
 	// sound. See also o60_soundOps()
-	if (_heversion >= 61 && (_gameId != GID_PUTTDEMO))
+	if (_heversion >= 60 && (_gameId != GID_PUTTDEMO))
 		offset = pop();
 
 #ifndef DISABLE_SCUMM_7_8
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 82a97a673b..e390c095a8 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -86,7 +86,7 @@ void ScummEngine::setupScummVars() {
 		VAR_USERPUT = 53;
 	}
 
-	if (_gameId == GID_LOOM256 || _version >= 5) {
+	if (_version >= 5) {
 		VAR_SOUNDPARAM = 64;
 		VAR_SOUNDPARAM2 = 65;
 		VAR_SOUNDPARAM3 = 66;
@@ -571,15 +571,6 @@ void ScummEngine_v7::initScummVars() {
 }
 #endif
 
-void ScummEngine_v60he::initScummVars() {
-	ScummEngine::initScummVars();
-
-	VAR(VAR_MACHINE_SPEED) = 2;
-
-	VAR(VAR_SOUNDPARAM) = 1;  // Soundblaster for music
-	VAR(VAR_SOUNDPARAM2) = 1; // Soundblaster for sound effects
-}
-
 #ifndef DISABLE_HE
 void ScummEngine_v70he::initScummVars() {
 	ScummEngine::initScummVars();
@@ -671,11 +662,6 @@ void ScummEngine::initScummVars() {
 				VAR(VAR_SOUNDCARD) = 3;
 			}
 		}
-		if (_gameId == GID_LOOM256 || _version >= 5) {
-			VAR(VAR_SOUNDPARAM) = 0;
-			VAR(VAR_SOUNDPARAM2) = 0;
-			VAR(VAR_SOUNDPARAM3) = 0;
-		}
 
 		if (_platform == Common::kPlatformFMTowns)
 			VAR(VAR_VIDEOMODE) = 42;
@@ -692,10 +678,8 @@ void ScummEngine::initScummVars() {
 		else
 			VAR(VAR_VIDEOMODE) = 19;
 
-		VAR(VAR_CURRENTDRIVE) = 0;
-
 		if (_platform == Common::kPlatformMacintosh && (_features & GF_OLD_BUNDLE)) {
-			// This is the for the Mac version of Indy3/Loom
+			// Set screen size for the Macintosh version of Indy3/Loom
 			VAR(39) = 320;
 		}
 		if (_platform == Common::kPlatformPC && _gameId == GID_LOOM) {
@@ -711,6 +695,14 @@ void ScummEngine::initScummVars() {
 			VAR(VAR_MOUSEPRESENT) = 1;
 		if (_version == 6)
 			VAR(VAR_V6_EMSSPACE) = 10000;
+
+		if (_heversion >= 60) {
+			// Set fast speed, to enable all animations
+			VAR(VAR_MACHINE_SPEED) = 2;
+
+			VAR(VAR_SOUNDPARAM) = 1;  // Soundblaster for music
+			VAR(VAR_SOUNDPARAM2) = 1; // Soundblaster for sound effects
+		}
 	}
 
 	if (VAR_ROOM_WIDTH != 0xFF && VAR_ROOM_HEIGHT != 0xFF) {