[Scummvm-cvs-logs] SF.net SVN: scummvm:[52469] scummvm/trunk/engines/sci/sci.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 52469
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52469&view=rev
Author:   m_kiewitz
Date:     2010-08-31 11:38:07 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
SCI: renaming config-variables

"sci_dither" got removed, "undither" renamed to "sci_undither". Also changed logic for handling "sci_originalsaveload"

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-08-31 11:27:01 UTC (rev 52468)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-08-31 11:38:07 UTC (rev 52469)
@@ -179,8 +179,9 @@
 	g_eventRec.registerRandomSource(_rng, "sci");
 
 	// Assign default values to the config manager, in case settings are missing
-	ConfMan.registerDefault("undither", "true");
-	ConfMan.registerDefault("enable_fb01", "false");
+	ConfMan.registerDefault("sci_undither", "true");
+	ConfMan.registerDefault("sci_originalsaveload", "false");
+	ConfMan.registerDefault("sci_enable_fb01", "false");
 
 	_resMan = new ResourceManager();
 	assert(_resMan);
@@ -208,7 +209,7 @@
 
 	// Initialize the game screen
 	_gfxScreen = new GfxScreen(_resMan);
-	_gfxScreen->debugUnditherSetState(ConfMan.getBool("undither"));
+	_gfxScreen->debugUnditherSetState(ConfMan.getBool("sci_undither"));
 
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
@@ -257,11 +258,6 @@
 	// Patch in our save/restore code, so that dialogs are replaced
 	patchGameSaveRestore(segMan);
 
-	// Switch off undithering, if requested by user
-	Common::String ditherOption = ConfMan.get("sci_dither");
-	if (ditherOption != "")
-		_gfxScreen->debugUnditherSetState(false);
-
 	if (_gameDescription->flags & ADGF_ADDENGLISH) {
 		// if game is multilingual
 		Common::Language selectedLanguage = Common::parseLanguage(ConfMan.get("language"));
@@ -352,8 +348,7 @@
 		break;
 	}
 
-	Common::String originalSaveLoadOption = ConfMan.get("sci_originalsaveload");
-	if (originalSaveLoadOption != "")
+	if (ConfMan.getBool("sci_originalsaveload"))
 		return;
 
 	for (uint16 kernelNr = 0; kernelNr < kernelCount; kernelNr++) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.