[Scummvm-cvs-logs] SF.net SVN: scummvm: [33077] scummvm/branches/gsoc2008-rtl/engines/agi/agi. cpp

cpage88 at users.sourceforge.net cpage88 at users.sourceforge.net
Tue Jul 15 21:35:41 CEST 2008


Revision: 33077
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33077&view=rev
Author:   cpage88
Date:     2008-07-15 12:35:40 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
Reverted an incorrect change to AGI

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp

Modified: scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp	2008-07-15 18:53:22 UTC (rev 33076)
+++ scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp	2008-07-15 19:35:40 UTC (rev 33077)
@@ -618,7 +618,6 @@
 	// Setup mixer
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("music_volume"));
 
 	const GameSettings *g;
 
@@ -814,7 +813,6 @@
 	int soundVolumeSFX = ConfMan.getInt("music_volume");
 	int soundVolumeSpeech = ConfMan.getInt("music_volume");
 
-	_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, soundVolumeMusic);
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX);
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);


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