[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.420,1.421 resource_v2.cpp,1.49,1.50

[Max Horn]

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

Modified Files:
	scumm.cpp resource_v2.cpp 
Log Message:
Init music engine within setupMusic(), even for V1 and V2 games

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -d -r1.420 -r1.421
--- scumm.cpp	10 Apr 2005 01:23:33 -0000	1.420
+++ scumm.cpp	10 Apr 2005 01:31:30 -0000	1.421
@@ -1671,6 +1671,10 @@
 		_musicEngine = new Player_V3A(this);
 	} else if ((_features & GF_AMIGA) && (_version < 5)) {
 		_musicEngine = NULL;
+	} else if (_gameId == GID_MANIAC && (_version == 1)) {
+		_musicEngine = new Player_V1(this, _midiDriver != MD_PCSPK);
+	} else if (_version <= 2) {
+		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);;
 	} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
 	} else if (_version > 2 && _heversion <= 60) {

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- resource_v2.cpp	10 Apr 2005 00:51:47 -0000	1.49
+++ resource_v2.cpp	10 Apr 2005 01:31:31 -0000	1.50
@@ -22,8 +22,6 @@
 #include "stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
-#include "scumm/player_v2.h"
-#include "scumm/player_v1.h"
 #include "scumm/resource.h"
 #include "sound/mididrv.h"
 
@@ -33,9 +31,6 @@
 	int i;
 
 	if (_gameId == GID_MANIAC) {
-		if (!(_features & GF_AMIGA) && !(_features & GF_NES))
-			_musicEngine = new Player_V1(this, _midiDriver != MD_PCSPK);
-
 		if (_features & GF_NES)
 			_numGlobalObjects = 775;
 		else
@@ -52,9 +47,6 @@
 		_numScripts = 200;
 		_numSounds = 100;
 	} else if (_gameId == GID_ZAK) {
-		if (!(_features & GF_AMIGA))
-			_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
-
 		_numGlobalObjects = 775;
 		_numRooms = 61;
 		_numCostumes = 37;
@@ -114,9 +106,6 @@
 
 void ScummEngine_v2::readEnhancedIndexFile() {
 
-	if (!(_features & GF_AMIGA))
-		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
-
 	_numGlobalObjects = _fileHandle->readUint16LE();
 	_fileHandle->seek(_numGlobalObjects, SEEK_CUR);
 	_numRooms = _fileHandle->readByte();