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

[Nicolas Noble]

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

Modified Files:
	gameDetector.cpp 
Log Message:
More command line and config file bug fixes:
  -) fixed the save of the gfx_mode
  -) fixed the help line for gfx_mode
  -) adding some error messages in the config file loading


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** gameDetector.cpp	27 Apr 2002 21:43:30 -0000	1.44
--- gameDetector.cpp	27 Apr 2002 22:12:36 -0000	1.45
***************
*** 50,54 ****
  	"\t-r         - emulate roland mt32 instruments\n"
  	"\t-f         - fullscreen mode\n"
! 	"\t-g<mode>   - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle.advmame2x)\n"
  	"\t-a         - specify game is amiga version\n"
  #if defined(UNIX) || defined(UNIX_X11)
--- 50,54 ----
  	"\t-r         - emulate roland mt32 instruments\n"
  	"\t-f         - fullscreen mode\n"
! 	"\t-g<mode>   - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x)\n"
  	"\t-a         - specify game is amiga version\n"
  #if defined(UNIX) || defined(UNIX_X11)
***************
*** 93,99 ****
--- 93,106 ----
                  else
                          _mt32emulate = false;
+ 	
+ 	if ((val = scummcfg->get("nosubtitles")))
+ 		if (!scumm_stricmp(val, "true"))
+ 			_noSubtitles = true;
+ 		else
+ 			_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);
***************
*** 102,105 ****
--- 109,113 ----
          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);
***************
*** 170,174 ****
  					if (_gfx_mode == -1)
  						goto ShowHelpAndExit;
! 					scummcfg->set("gfx_mode", _gfx_mode, "scummvm");
  					goto NextArg;
  				case 'l':
--- 178,182 ----
  					if (_gfx_mode == -1)
  						goto ShowHelpAndExit;
! 					scummcfg->set("gfx_mode", s, "scummvm");
  					goto NextArg;
  				case 'l':