Set machine speed to fast in all HE games.

Fixes missing animation in old freddemo and maybe others too.

svn-id: r19327

3 files changed, 20 insertions, 9 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index fc3f4b2522..7f77340da6 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -790,6 +790,8 @@ 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/scumm.cpp b/scumm/scumm.cpp
index 7ed05fa6b2..821023c591 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -532,12 +532,12 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
 	{"9c143c5905055d5df7a0f014ab379aee", "Putt-Putt Goes To The Moon (Windows Demo)", GID_HEGAME, 6, 70, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
+	{"0b3222aaa7efcf283eb621e0cefd26cc", "Putt-Putt Joins The Parade (Russian)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
+	 GF_USE_KEY, Common::kPlatformWindows},
 	{"31aa57f460a3d12429f0552a46a90b39", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	  GF_USE_KEY | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
 	{"f40a7f495f59188ca57a9d1d50301bb6", "Putt-Putt Joins The Parade (Macintosh Demo)", GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	  GF_USE_KEY | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
-	{"0b3222aaa7efcf283eb621e0cefd26cc", "Putt-Putt Joins The Parade (DOS Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
-	 GF_USE_KEY, Common::kPlatformWindows},
 	{"6a30a07f353a75cdc602db27d73e1b42", "Putt-Putt Joins The Parade (Windows)", GID_HEGAME, 6, 70, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"37ff1b308999c4cca7319edfcc1280a0", "Putt-Putt Joins The Parade (Windows Demo)", GID_HEGAME, 6, 70, MDT_NONE,
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 18e3997e70..852183b0f1 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -569,10 +569,22 @@ 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();
 
+	if (VAR_MACHINE_SPEED != 0xFF)
+		VAR(VAR_MACHINE_SPEED) = 13;
+
 	VAR(VAR_NUM_SOUND_CHANNELS) = 8;
 	VAR(VAR_MUSIC_CHANNEL) = 1;
 	VAR(VAR_SOUND_CHANNEL) = 2;
@@ -581,6 +593,8 @@ void ScummEngine_v70he::initScummVars() {
 void ScummEngine_v72he::initScummVars() {
 	ScummEngine_v70he::initScummVars();
 
+	VAR(VAR_VIDEO_PERFORMANCE) = 26;
+
 	VAR(VAR_NUM_ROOMS) = _numRooms - 1;
 	VAR(VAR_NUM_SCRIPTS) = _numScripts - 1;
 	VAR(VAR_NUM_SOUNDS) = _numSounds - 1;
@@ -657,13 +671,8 @@ void ScummEngine::initScummVars() {
 			}
 		}
 		if (_gameId == GID_LOOM256 || _version >= 5) {
-			if (_heversion >= 60) {
-				VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
-				VAR(VAR_SOUNDPARAM2) = 1; // soundblaster for sfx
-			} else {
-				VAR(VAR_SOUNDPARAM) = 0;
-				VAR(VAR_SOUNDPARAM2) = 0;
-			}
+			VAR(VAR_SOUNDPARAM) = 0;
+			VAR(VAR_SOUNDPARAM2) = 0;
 			VAR(VAR_SOUNDPARAM3) = 0;
 		}