[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.4,1.5 gameDetector.h,1.3,1.4 scumm.h,1.109,1.110

James Brown ender at users.sourceforge.net
Sun Apr 7 00:26:57 CEST 2002


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

Modified Files:
	gameDetector.cpp gameDetector.h scumm.h 
Log Message:
Add support for selecting CDROM drive for Loom/MI cd audio, fix midi support



Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gameDetector.cpp	7 Apr 2002 04:29:14 -0000	1.4
--- gameDetector.cpp	7 Apr 2002 07:31:47 -0000	1.5
***************
*** 32,35 ****
--- 32,36 ----
                                                  "Flags:\n" \
                                                  "\tv       - show version info and exit\n" \
+ 												"\tc<num>  - use cdrom <num> for cd audio\n" \
                                                  "\td       - enable debug output\n" \
                                                  "\tn       - no subtitles for speech\n" \
***************
*** 131,138 ****
                                          goto NextArg;
                                  case 'g':
!                         if (*(s+1) == '\0')
!                                 goto ShowHelpAndExit;
!                                         _videoMode = atoi(s+1);
!                                         goto NextArg;
  
                                  default:
--- 132,145 ----
                                          goto NextArg;
                                  case 'g':
! 									if (*(s+1) == '\0')
! 											goto ShowHelpAndExit;
!                                     _videoMode = atoi(s+1);
!                                     goto NextArg;
! 
!                                 case 'c':
! 									if (*(s+1) == '\0')
! 											goto ShowHelpAndExit;
!                                     _cdrom = atoi(s+1);
!                                     goto NextArg;
  
                                  default:

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gameDetector.h	7 Apr 2002 04:29:14 -0000	1.3
--- gameDetector.h	7 Apr 2002 07:31:47 -0000	1.4
***************
*** 45,48 ****
--- 45,49 ----
  
  	int _scummVersion;
+ 	int _cdrom;
  	bool _restore;
  

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** scumm.h	3 Apr 2002 15:45:32 -0000	1.109
--- scumm.h	7 Apr 2002 07:31:47 -0000	1.110
***************
*** 1292,1295 ****
--- 1292,1296 ----
  	uint32 filePos(void *handle);
  	bool checkFixedDisk();
+ 	int _cdrom;
  
  	int fileReadByte();





More information about the Scummvm-git-logs mailing list