[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.45,1.46

[Max Horn]

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

Modified Files:
	gameDetector.cpp 
Log Message:
spaces to tabs; don't hard code midi driver ID on MacOS

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** gameDetector.cpp	27 Apr 2002 22:12:36 -0000	1.45
--- gameDetector.cpp	28 Apr 2002 00:31:31 -0000	1.46
***************
*** 62,96 ****
  void GameDetector::updateconfig()
  {
!         const char * val;
  
!         if ((val = scummcfg->get("amiga")))
!                 if (!scumm_stricmp(val, "true"))
!                         _amiga = true;
!                 else
!                         _amiga = false;
  
!         if ((val = scummcfg->get("fullscreen", "scummvm")))
!                 if (!scumm_stricmp(val, "true"))
!                         _fullScreen = true;
!                 else
!                         _fullScreen = false;
  
!         if ((val = scummcfg->get("path")))
!                 _gameDataPath = Scumm::Strdup(val);
  
!         if ((val = scummcfg->get("tempo")))
!                 _gameTempo = strtol(val, 0, 0);
  
!         if ((val = scummcfg->get("music_volume")))
!                 _music_volume = atoi(val);
  
!         if ((val = scummcfg->get("sfx_volume")))
!                 _sfx_volume = atoi(val);
  
!         if ((val = scummcfg->get("mt32emulate")))
!                 if (!scumm_stricmp(val, "true"))
!                         _mt32emulate = true;
!                 else
!                         _mt32emulate = false;
  	
  	if ((val = scummcfg->get("nosubtitles")))
--- 62,96 ----
  void GameDetector::updateconfig()
  {
! 	const char * val;
  
! 	if ((val = scummcfg->get("amiga")))
! 		if (!scumm_stricmp(val, "true"))
! 			_amiga = true;
! 		else
! 			_amiga = false;
  
! 	if ((val = scummcfg->get("fullscreen", "scummvm")))
! 		if (!scumm_stricmp(val, "true"))
! 			_fullScreen = true;
! 		else
! 			_fullScreen = false;
  
! 	if ((val = scummcfg->get("path")))
! 		_gameDataPath = Scumm::Strdup(val);
  
! 	if ((val = scummcfg->get("tempo")))
! 		_gameTempo = strtol(val, 0, 0);
  
! 	if ((val = scummcfg->get("music_volume")))
! 		_music_volume = atoi(val);
  
! 	if ((val = scummcfg->get("sfx_volume")))
! 		_sfx_volume = atoi(val);
  
! 	if ((val = scummcfg->get("mt32emulate")))
! 		if (!scumm_stricmp(val, "true"))
! 			_mt32emulate = true;
! 		else
! 			_mt32emulate = false;
  	
  	if ((val = scummcfg->get("nosubtitles")))
***************
*** 100,119 ****
  			_noSubtitles = false;
  
!         if ((val = scummcfg->get("music_driver")))
!                 if (!parseMusicDriver(val)) {
! 			printf("Error in the config file: invalid music_driver.\n");
!                         printf(USAGE_STRING);
!                         exit(-1);
!                 }
  
!         if ((val = scummcfg->get("gfx_mode")))
!                 if ((_gfx_mode = parseGraphicsMode(val)) == -1) {
! 		    printf("Error in the config file: invalid gfx_mode.\n");
!                     printf(USAGE_STRING);
!                     exit(-1);
!                 }
  
!         if ((val = scummcfg->get("cdrom")))
!                 _cdrom = atoi(val);
  }
  
--- 100,119 ----
  			_noSubtitles = false;
  
! 	if ((val = scummcfg->get("music_driver")))
! 			if (!parseMusicDriver(val)) {
! 		printf("Error in the config file: invalid music_driver.\n");
! 					printf(USAGE_STRING);
! 					exit(-1);
! 			}
  
! 	if ((val = scummcfg->get("gfx_mode")))
! 			if ((_gfx_mode = parseGraphicsMode(val)) == -1) {
! 		printf("Error in the config file: invalid gfx_mode.\n");
! 				printf(USAGE_STRING);
! 				exit(-1);
! 			}
  
! 	if ((val = scummcfg->get("cdrom")))
! 			_cdrom = atoi(val);
  }
  
***************
*** 207,211 ****
  					_gameDataPath = s;
  					scummcfg->set("path", _gameDataPath);
!  					goto NextArg;
  				case 'r':
  					_mt32emulate = true;
--- 207,211 ----
  					_gameDataPath = s;
  					scummcfg->set("path", _gameDataPath);
! 					goto NextArg;
  				case 'r':
  					_mt32emulate = true;
***************
*** 261,265 ****
  		scummcfg->flush();
  #else
! 	_midi_driver = 4; /* FIXME: don't use numerics */
  	_exe_name = *argv;
  	_gameDataPath = (char *)malloc(strlen(_exe_name) + 3);
--- 261,265 ----
  		scummcfg->flush();
  #else
! 	_midi_driver = MD_QTMUSIC;
  	_exe_name = *argv;
  	_gameDataPath = (char *)malloc(strlen(_exe_name) + 3);