[Scummvm-cvs-logs] SF.net SVN: scummvm: [27279] scummvm/branches/branch-0-10-0/engines/agos/ input.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sun Jun 10 07:40:21 CEST 2007
Revision: 27279
http://scummvm.svn.sourceforge.net/scummvm/?rev=27279&view=rev
Author: Kirben
Date: 2007-06-09 22:40:20 -0700 (Sat, 09 Jun 2007)
Log Message:
-----------
Fix toggling music on/off in games, when using non-MIDI music.
Modified Paths:
--------------
scummvm/branches/branch-0-10-0/engines/agos/input.cpp
Modified: scummvm/branches/branch-0-10-0/engines/agos/input.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/input.cpp 2007-06-10 04:37:45 UTC (rev 27278)
+++ scummvm/branches/branch-0-10-0/engines/agos/input.cpp 2007-06-10 05:40:20 UTC (rev 27279)
@@ -25,6 +25,7 @@
#include "common/stdafx.h"
+#include "common/config-manager.h"
#include "common/file.h"
#include "agos/intern.h"
@@ -578,10 +579,11 @@
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) - 16);
break;
case 'm':
+ _musicPaused ^= 1;
if (_midiEnabled) {
- _midi.pause(_musicPaused ^= 1);
+ _midi.pause(_musicPaused);
}
- // TODO
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (_musicPaused) ? 0 : ConfMan.getInt("music_volume"));
break;
case 's':
if (getGameId() == GID_SIMON1DOS) {
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