[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.537,2.538 scumm.cpp,1.616,1.617 vars.cpp,1.151,1.152

kirben kirben at users.sourceforge.net
Wed Oct 26 23:52:59 CEST 2005


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

Modified Files:
	intern.h scumm.cpp vars.cpp 
Log Message:

Set machine speed to fast in all HE games.
Fixes missing animation in old freddemo and maybe others too.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.537
retrieving revision 2.538
diff -u -d -r2.537 -r2.538
--- intern.h	22 Oct 2005 23:08:14 -0000	2.537
+++ intern.h	27 Oct 2005 06:51:41 -0000	2.538
@@ -790,6 +790,8 @@
 	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);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -d -r1.616 -r1.617
--- scumm.cpp	26 Oct 2005 05:30:08 -0000	1.616
+++ scumm.cpp	27 Oct 2005 06:51:42 -0000	1.617
@@ -532,12 +532,12 @@
 	{"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,

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- vars.cpp	18 Oct 2005 01:30:21 -0000	1.151
+++ vars.cpp	27 Oct 2005 06:51:42 -0000	1.152
@@ -569,10 +569,22 @@
 }
 #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_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 @@
 			}
 		}
 		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;
 		}
 





More information about the Scummvm-git-logs mailing list