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

[m_kiewitz at users.sourceforge.net]

Revision: 46247
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46247&view=rev
Author:   m_kiewitz
Date:     2009-12-03 22:32:48 +0000 (Thu, 03 Dec 2009)

Log Message:
-----------
SCI: Don't call SciMusic for volume changes when using old code

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

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-03 22:24:29 UTC (rev 46246)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-03 22:32:48 UTC (rev 46247)
@@ -479,9 +479,11 @@
 }
 
 void SoundCommandParser::cmdVolume(reg_t obj, SongHandle handle, int value) {
-	if (_argc > 1)
-		_music->soundSetMasterVolume(obj.toSint16());
-	_acc = make_reg(0, _music->soundGetMasterVolume());
+	#ifndef USE_OLD_MUSIC_FUNCTIONS
+		if (_argc > 1)
+			_music->soundSetMasterVolume(obj.toSint16());
+		_acc = make_reg(0, _music->soundGetMasterVolume());
+	#endif
 }
 
 void SoundCommandParser::cmdFadeHandle(reg_t obj, SongHandle handle, int value) {


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