[Scummvm-cvs-logs] SF.net SVN: scummvm:[41847] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 41847
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41847&view=rev
Author:   lordhoto
Date:     2009-06-25 01:29:55 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Add config option for Kyra1 16 color, it'll only use dithering when "16_color" is set to true.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_lok.cpp
    scummvm/trunk/engines/kyra/kyra_v1.cpp
    scummvm/trunk/engines/kyra/kyra_v1.h

Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-06-25 01:29:41 UTC (rev 41846)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-06-25 01:29:55 UTC (rev 41847)
@@ -157,7 +157,7 @@
 }
 
 Common::Error KyraEngine_LoK::init() {
-	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiResOverlay)
+	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiResOverlay && ConfMan.getBool("16_color"))
 		_screen = new Screen_LoK_16(this, _system);
 	else
 		_screen = new Screen_LoK(this, _system);
@@ -909,6 +909,9 @@
 	// Most settings already have sensible defaults. This one, however, is
 	// specific to the Kyra engine.
 	ConfMan.registerDefault("walkspeed", 2);
+
+	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiResOverlay)
+		ConfMan.registerDefault("16_color", false);
 }
 
 void KyraEngine_LoK::readSettings() {

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-06-25 01:29:41 UTC (rev 41846)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-06-25 01:29:55 UTC (rev 41847)
@@ -94,8 +94,6 @@
 }
 
 Common::Error KyraEngine_v1::init() {
-	registerDefaultSettings();
-
 	// Setup mixer
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));

Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h	2009-06-25 01:29:41 UTC (rev 41846)
+++ scummvm/trunk/engines/kyra/kyra_v1.h	2009-06-25 01:29:55 UTC (rev 41847)
@@ -181,13 +181,16 @@
 	// Engine APIs
 	virtual Common::Error init();
 	virtual Common::Error go() = 0;
+
 	virtual Common::Error run() {
 		Common::Error err;
+		registerDefaultSettings();
 		err = init();
 		if (err != Common::kNoError)
 			return err;
 		return go();
 	}
+
 	virtual ::GUI::Debugger *getDebugger();
 	virtual bool hasFeature(EngineFeature f) const;
 	virtual void pauseEngineIntern(bool pause);


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