[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.105,1.106 sky.cpp,1.190,1.191
Joost Peters
joostp at users.sourceforge.net
Mon Jan 16 16:25:06 CET 2006
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31378/sky
Modified Files:
control.cpp sky.cpp
Log Message:
Commit patch #1171517 by salty-horse (save speech and sfx preferences BASS engine in config file)
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- control.cpp 13 Dec 2005 15:27:32 -0000 1.105
+++ control.cpp 17 Jan 2006 00:24:01 -0000 1.106
@@ -714,6 +714,9 @@
pButton->_text = 0x7000 + 86;
_statusBar->setToText(0x7000 + 86);
}
+
+ ConfMan.set("sfx_mute", (SkyEngine::_systemVars.systemFlags & SF_FX_OFF) != 0);
+
pButton->drawToScreen(WITH_MASK);
buttonControl(pButton);
_system->updateScreen();
@@ -737,6 +740,7 @@
}
ConfMan.set("subtitles", (flags & SF_ALLOW_TEXT) != 0);
+ ConfMan.set("speech_mute", (flags & SF_ALLOW_SPEECH) == 0);
SkyEngine::_systemVars.systemFlags |= flags;
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- sky.cpp 30 Dec 2005 14:18:21 -0000 1.190
+++ sky.cpp 17 Jan 2006 00:24:01 -0000 1.191
@@ -308,6 +308,9 @@
if (!_mixer->isReady())
warning("Sound initialisation failed");
+ if (ConfMan.getBool("sfx_mute")) {
+ SkyEngine::_systemVars.systemFlags |= SF_FX_OFF;
+ }
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
_floppyIntro = ConfMan.getBool("alt_intro");
@@ -330,7 +333,6 @@
}
if (isCDVersion()) {
- _systemVars.systemFlags |= SF_ALLOW_SPEECH;
if (ConfMan.hasKey("nosubtitles")) {
warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
if (!ConfMan.getBool("nosubtitles"))
@@ -339,6 +341,10 @@
if (ConfMan.getBool("subtitles"))
_systemVars.systemFlags |= SF_ALLOW_TEXT;
+
+ if (!ConfMan.getBool("speech_mute"))
+ _systemVars.systemFlags |= SF_ALLOW_SPEECH;
+
} else
_systemVars.systemFlags |= SF_ALLOW_TEXT;
More information about the Scummvm-git-logs
mailing list