[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.529.2.6,2.529.2.7 script_v6.cpp,1.453.2.3,1.453.2.4 scumm.cpp,1.603.2.30,1.603.2.31 vars.cpp,1.150.2.5,1.150.2.6

[kirben]

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

Modified Files:
      Tag: branch-0-8-0
	intern.h script_v6.cpp scumm.cpp vars.cpp 
Log Message:

Backport fix for regressions in earliest HE games.
Remove duplicate.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.529.2.6
retrieving revision 2.529.2.7
diff -u -d -r2.529.2.6 -r2.529.2.7
--- intern.h	15 Jan 2006 06:45:14 -0000	2.529.2.6
+++ intern.h	15 Jan 2006 09:56:24 -0000	2.529.2.7
@@ -784,8 +784,6 @@
 	virtual void executeOpcode(byte i);
 	virtual const char *getOpcodeDesc(byte i);
 
-	virtual void initScummVars();
-
 	virtual void saveOrLoad(Serializer *s, uint32 savegameVersion);
 
 	void localizeArray(int slot, byte scriptSlot);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.453.2.3
retrieving revision 1.453.2.4
diff -u -d -r1.453.2.3 -r1.453.2.4
--- script_v6.cpp	21 Oct 2005 23:33:06 -0000	1.453.2.3
+++ script_v6.cpp	15 Jan 2006 09:56:24 -0000	1.453.2.4
@@ -1087,7 +1087,7 @@
 	// 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

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.30
retrieving revision 1.603.2.31
diff -u -d -r1.603.2.30 -r1.603.2.31
--- scumm.cpp	15 Jan 2006 06:45:15 -0000	1.603.2.30
+++ scumm.cpp	15 Jan 2006 09:56:25 -0000	1.603.2.31
@@ -1813,9 +1813,6 @@
 			VAR(85) = 1;
 	}
 
-	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
-		_scummVars[74] = 1225;
-
 	if (_imuse) {
 		_imuse->setBase(res.address[rtSound]);
 	}

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.150.2.5
retrieving revision 1.150.2.6
diff -u -d -r1.150.2.5 -r1.150.2.6
--- vars.cpp	15 Jan 2006 06:45:15 -0000	1.150.2.5
+++ vars.cpp	15 Jan 2006 09:56:25 -0000	1.150.2.6
@@ -572,15 +572,6 @@
 }
 #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();
@@ -713,6 +704,14 @@
 			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) {