[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.599,1.600

[Max Horn]

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

Modified Files:
	scumm.cpp 
Log Message:
Removed very old GP32 hack (any new port would have to revise this code anyway); disabled some more V7/V8 code conditionally

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -d -r1.599 -r1.600
--- scumm.cpp	14 Oct 2005 10:27:24 -0000	1.599
+++ scumm.cpp	14 Oct 2005 11:04:15 -0000	1.600
@@ -884,6 +884,7 @@
 		File::addDefaultDirectory(_gameDataPath + "Rooms 3/");
 	}
 
+#ifndef DISABLE_SCUMM_7_8
 #ifdef MACOSX
 	if (_version == 8 && !memcmp(_gameDataPath.c_str(), "/Volumes/MONKEY3_", 17)) {
 		// Special case for COMI on Mac OS X. The mount points on OS X depend
@@ -913,6 +914,7 @@
 		File::addDefaultDirectory(_gameDataPath + "DATA/");
 		File::addDefaultDirectory(_gameDataPath + "data/");
 	}
+#endif
 
 	// We read data directly from NES ROM instead of extracting it with
 	// external tool
@@ -2055,16 +2057,15 @@
 	else
 		_enable_gs = ConfMan.getBool("enable_gs");
 
-#ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
 	/* Bind the mixer to the system => mixer will be invoked
 	 * automatically when samples need to be generated */
 	if (!_mixer->isReady()) {
-		printf("Sound mixer initialization failed\n");
+		warning("Sound mixer initialization failed\n");
 		if (_midiDriver == MD_ADLIB ||
 				_midiDriver == MD_PCSPK ||
 				_midiDriver == MD_PCJR)	{
 			_midiDriver = MD_NULL;
-			printf("MIDI driver depends on sound mixer, switching to null MIDI driver\n");
+			warning("MIDI driver depends on sound mixer, switching to null MIDI driver\n");
 		}
 	}
 
@@ -2118,8 +2119,6 @@
 	}
 
 	setupVolumes();
-
-#endif // ph0x-hack
 }
 
 void ScummEngine::setupVolumes() {