[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.5,1.6 queen.h,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Wed Oct 8 15:00:15 CEST 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv6106/queen

Modified Files:
	queen.cpp queen.h 
Log Message:
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- queen.cpp	5 Oct 2003 16:07:07 -0000	1.5
+++ queen.cpp	8 Oct 2003 21:59:22 -0000	1.6
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "queen/queen.h"
+#include "common/config-manager.h"
 #include "common/file.h"
 #include "base/gameDetector.h"
 #include "base/plugins.h"
@@ -60,10 +61,10 @@
 	if (!_mixer->bindToSystem(syst))
 		warning("Sound initialisation failed.");
 
-	_mixer->setVolume(detector->_sfx_volume);
+	_mixer->setVolume(ConfMan.getInt("sfx_volume"));
 	
 	_debugMode = detector->_debugMode;
-	_debugLevel = detector->_debugLevel;
+	_debugLevel = ConfMan.getInt("debuglevel");
 	_detector = detector;
 
 	_fastMode = 0;

Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- queen.h	5 Oct 2003 16:07:07 -0000	1.4
+++ queen.h	8 Oct 2003 21:59:22 -0000	1.5
@@ -29,7 +29,6 @@
 #include "sound/mixer.h"
 #include "queen/resource.h"
 #include "queen/logic.h"
-#include "common/config-file.h"
 
 namespace Queen {
 





More information about the Scummvm-git-logs mailing list