[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.473,2.474

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4333/scumm

Modified Files:
	scummvm.cpp 
Log Message:
cut down on unnecessary GameDetector references

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.473
retrieving revision 2.474
diff -u -d -r2.473 -r2.474
--- scummvm.cpp	10 Nov 2003 00:58:22 -0000	2.473
+++ scummvm.cpp	10 Nov 2003 01:04:11 -0000	2.474
@@ -285,7 +285,7 @@
 };
 
 ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs)
-	: Engine(detector, syst),
+	: Engine(syst),
 	  _gameId(gs.id),
 	  _version(gs.version),
 	  _features(gs.features),
@@ -688,7 +688,7 @@
 	} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
 	} else if (_version > 2) {
-		MidiDriver *driver = detector->createMidi(_midiDriver);
+		MidiDriver *driver = GameDetector::createMidi(_midiDriver);
 		if (driver && _native_mt32)
 			driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 		_musicEngine = _imuse = IMuse::create(syst, _mixer, driver);
@@ -2795,12 +2795,12 @@
 	
 	const ScummGameSettings *g = scumm_settings;
 	while (g->gameName) {
-		if (!scumm_stricmp(detector->_game.gameName, g->gameName))
+		if (!scumm_stricmp(detector->_gameName.c_str(), g->gameName))
 			break;
 		g++;
 	}
 	if (!g->gameName)
-		error("Invalid game '%s'\n", detector->_game.gameName);
+		error("Invalid game '%s'\n", detector->_gameName.c_str());
 
 	ScummGameSettings game = *g;