libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scumm sound settings can now be changed from the gmm

Browse Source 
svn-id: r32851
This commit is contained in:
Christopher Page 2008-06-30 17:44:21 +00:00
parent e36166bda2
commit 30c52e215c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/input.cpp
View File

@ -514,7 +514,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
vol = Audio::Mixer::kMaxMixerVolume;
ConfMan.setInt("music_volume", vol);
updateSoundSettings();
syncSoundSettings();
} else if (lastKeyHit.ascii == '-' || lastKeyHit.ascii == '+') { // Change text speed
if (lastKeyHit.ascii == '+' && _defaultTalkDelay > 0)

2
engines/scumm/saveload.cpp
View File

@ -275,7 +275,7 @@ bool ScummEngine::loadState(int slot, bool compat) {
delete in;
// Update volume settings
updateSoundSettings();
syncSoundSettings();
// Init NES costume data
if (_game.platform == Common::kPlatformNES) {

6
engines/scumm/scumm.cpp
View File

@ -1108,7 +1108,7 @@ int ScummEngine::init() {
if (_game.version >= 5 && _game.version <= 7)
_sound->setupSound();
updateSoundSettings();
syncSoundSettings();
return 0;
}
@ -1667,7 +1667,7 @@ void ScummEngine::setupMusic(int midi) {
}
}
void ScummEngine::updateSoundSettings() {
void ScummEngine::syncSoundSettings() {
// Sync the engine with the config manager
int soundVolumeMusic = ConfMan.getInt("music_volume");
@ -2309,7 +2309,7 @@ void ScummEngine::mainMenuDialog() {
if (!_mainMenuDialog)
_mainMenuDialog = new MainMenuDialog(this);
runDialog(*_mainMenuDialog);
updateSoundSettings();
syncSoundSettings();
}
void ScummEngine::confirmExitDialog() {

2
engines/scumm/scumm.h
View File

@ -462,7 +462,7 @@ protected:
virtual void loadLanguageBundle() {}
void loadCJKFont();
void setupMusic(int midi);
void updateSoundSettings();
virtual void syncSoundSettings();
void setTalkspeed(int talkspeed);
int getTalkspeed();