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

[fingolfin at users.sourceforge.net]

Revision: 22247
Author:   fingolfin
Date:     2006-04-30 13:35:43 -0700 (Sun, 30 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22247&view=rev

Log Message:
-----------
Invoke updateSoundSettings a bit later, since it can only correctly set VAR_VOICE_MODE *after* setupScummVars() has been called

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-04-30 15:06:17 UTC (rev 22246)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-04-30 20:35:43 UTC (rev 22247)
@@ -969,6 +969,8 @@
 	if (_game.version >= 5)
 		_sound->setupSound();
 
+	updateSoundSettings();
+
 	return 0;
 }
 
@@ -1470,8 +1472,6 @@
 				_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
 		}
 	}
-
-	updateSoundSettings();
 }
 
 void ScummEngine::updateSoundSettings() {


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