[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.104,1.105

Jamieson Christian jamieson630 at users.sourceforge.net
Tue Jun 10 23:50:16 CEST 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv22626/scummvm/common

Modified Files:
	gameDetector.cpp 
Log Message:
Fix for bug [741592] GUI: Switching music driver mixes up music
Implement true music driver selection from the GUI options dialog.

This implementation depends on a new, transient config domain called
"user-overrides". Probably any other config changes made from the
options dialog will need to go into this domain, which is now
loaded after the game settings are loaded.

I hope this is the right way to do it. I'm still a little fuzzy
about our game settings architecture. If anybody suddenly gets
a "[user-overrides]" section showing up in their scummvm.ini or
scummvm.rc files, you'll know why.

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- gameDetector.cpp	6 Jun 2003 23:57:59 -0000	1.104
+++ gameDetector.cpp	11 Jun 2003 06:49:45 -0000	1.105
@@ -487,6 +487,9 @@
 	g_config->rename_domain(name, "game-specific");
 	g_config->rename_domain("game-specific", name);
 	updateconfig();
+	g_config->set_domain ("user-overrides");
+	updateconfig();
+	g_config->delete_domain ("user-overrides");
 }
 
 int GameDetector::parseGraphicsMode(const char *s) {





More information about the Scummvm-git-logs mailing list