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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Jun 13 22:13:08 CEST 2007


Revision: 27390
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27390&view=rev
Author:   thebluegr
Date:     2007-06-13 13:13:06 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
Moved a check for game type after engine initialization

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

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2007-06-13 20:00:39 UTC (rev 27389)
+++ scummvm/trunk/engines/saga/saga.cpp	2007-06-13 20:13:06 UTC (rev 27390)
@@ -148,16 +148,6 @@
 	_soundVolume = ConfMan.getInt("sfx_volume") / 25;
 	_musicVolume = ConfMan.getInt("music_volume") / 25;
 	_subtitlesEnabled = ConfMan.getBool("subtitles");
-	if (getGameType() == GType_IHNM) {
-		if (!ConfMan.hasKey("voices")) {
-			_voicesEnabled = true;
-			ConfMan.setBool("voices", true);
-		} else {
-			_voicesEnabled = ConfMan.getBool("voices");
-		}
-	} else {
-		_voicesEnabled = true;
-	}
 	_readingSpeed = getTalkspeed();
 	_copyProtection = ConfMan.getBool("copy_protection");
 
@@ -231,6 +221,17 @@
 
 	_gfx->initPalette();
 
+	if (getGameType() == GType_IHNM) {
+		if (!ConfMan.hasKey("voices")) {
+			_voicesEnabled = true;
+			ConfMan.setBool("voices", true);
+		} else {
+			_voicesEnabled = ConfMan.getBool("voices");
+		}
+	} else {
+		_voicesEnabled = true;
+	}
+
 	// FIXME: This is the ugly way of reducing redraw overhead. It works
 	//        well for 320x200 but it's unclear how well it will work for
 	//        640x480.


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




More information about the Scummvm-git-logs mailing list