[Scummvm-cvs-logs] CVS: scummvm config-file.cpp,1.1,1.2 gameDetector.cpp,1.43,1.44

[Nicolas Noble]

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

Modified Files:
	config-file.cpp gameDetector.cpp 
Log Message:
Fixed the 'config-file is predominant upon command line' bug...


Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/config-file.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config-file.cpp	27 Apr 2002 17:21:38 -0000	1.1
--- config-file.cpp	27 Apr 2002 21:43:30 -0000	1.2
***************
*** 290,293 ****
--- 290,294 ----
  	    } else {
  		hash[i]->rename(d);
+ 		set_domain(d);
  	    }
  	}

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** gameDetector.cpp	27 Apr 2002 21:06:48 -0000	1.43
--- gameDetector.cpp	27 Apr 2002 21:43:30 -0000	1.44
***************
*** 243,248 ****
  				goto ShowHelpAndExit;
  			_exe_name = s;
- 			scummcfg->rename_domain(s);
  			scummcfg->set_domain(s);
  			updateconfig();
  		}
--- 243,249 ----
  				goto ShowHelpAndExit;
  			_exe_name = s;
  			scummcfg->set_domain(s);
+ 			scummcfg->rename_domain("game-specific");
+ 			scummcfg->rename_domain(s);
  			updateconfig();
  		}