[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.30,1.31 scummvm.cpp,1.39,1.40

Max Horn fingolfin at users.sourceforge.net
Sat Sep 28 08:20:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv17872/scumm

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
patch #615842

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- scumm.h	25 Sep 2002 03:04:28 -0000	1.30
+++ scumm.h	28 Sep 2002 15:19:21 -0000	1.31
@@ -957,7 +957,6 @@
 	char transText[200];
 
 	bool checkFixedDisk();
-	int _cdrom;
 
 #if defined(SCUMM_LITTLE_ENDIAN)
 	uint32 fileReadDword() { return _fileHandle.readDwordLE(); }

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- scummvm.cpp	26 Sep 2002 12:29:10 -0000	1.39
+++ scummvm.cpp	28 Sep 2002 15:19:21 -0000	1.40
@@ -87,7 +87,6 @@
 	_features = detector->_features;
 	_soundCardType = detector->_soundCardType;
 	_noSubtitles = detector->_noSubtitles;
-	_cdrom = detector->_cdrom;
 	_defaultTalkDelay = detector->_talkSpeed;
 	_use_adlib = detector->_use_adlib;
 	
@@ -117,7 +116,8 @@
 	/* Initialize backend */
 	syst->init_size(_realWidth, _realHeight);
 	prop.cd_num = detector->_cdrom;
-	syst->property(OSystem::PROP_OPEN_CD, &prop);
+	if (prop.cd_num >= 0)
+		syst->property(OSystem::PROP_OPEN_CD, &prop);
 
 	/* Bind the mixer to the system => mixer will be invoked
 	 * automatically when samples need to be generated */	





More information about the Scummvm-git-logs mailing list