diff options
author | Christopher Page | 2008-06-26 23:22:28 +0000 |
---|---|---|
committer | Christopher Page | 2008-06-26 23:22:28 +0000 |
commit | e36166bda291f6f0af8af3328efce5aa4b83cd9a (patch) | |
tree | 2d50ccf7d05c10c2cdfd95251defe3c83e06013a /engines/agos | |
parent | d0dcc1ad7943a528f0f4f016a64ee45251adb6a8 (diff) | |
download | scummvm-rg350-e36166bda291f6f0af8af3328efce5aa4b83cd9a.tar.gz scummvm-rg350-e36166bda291f6f0af8af3328efce5aa4b83cd9a.tar.bz2 scummvm-rg350-e36166bda291f6f0af8af3328efce5aa4b83cd9a.zip |
Added syncSoundSettings() to Engine, sound settings can now be modified from the global main menu for most engines
svn-id: r32815
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/agos.cpp | 23 | ||||
-rw-r--r-- | engines/agos/agos.h | 2 |
2 files changed, 4 insertions, 21 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 0b08f659f3..f888931ad0 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -30,10 +30,6 @@ #include "common/system.h" #include "common/events.h" -//#include "gui/message.h" -//#include "gui/newgui.h" - -//#include "agos/dialogs.h" #include "agos/debugger.h" #include "agos/intern.h" #include "agos/agos.h" @@ -197,8 +193,6 @@ AGOSEngine::AGOSEngine(OSystem *syst) _backFlag = 0; - //_mainMenuDialog = NULL; - _debugMode = 0; _startMainScript = false; _continousMainScript = false; @@ -1084,25 +1078,12 @@ uint32 AGOSEngine::getTime() const { // FIXME: calling time() is not portable, use OSystem::getMillis instead return (uint32)time(NULL); } -/* -int AGOSEngine::runDialog(Dialog &dialog) { - - pauseEngine(true); - - int result = dialog.runModal(); - pauseEngine(false); - return 0; -} -/* -void AGOSEngine::mainMenuDialog() { - if (!_mainMenuDialog) - _mainMenuDialog = new MainMenuDialog(this); - runDialog(*_mainMenuDialog); +void AGOSEngine::syncSoundSettings() { _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); _midi.setVolume(ConfMan.getInt("music_volume")); } -*/ + } // End of namespace AGOS diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 87a6d2298a..11c04cd021 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -589,6 +589,8 @@ protected: void loadSoundFile(const char *filename); + virtual void syncSoundSettings(); + int getUserFlag(Item *item, int a); int getUserFlag1(Item *item, int a); int getUserItem(Item *item, int n); |