diff options
| author | Alejandro Marzini | 2010-07-30 05:28:09 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-30 05:28:09 +0000 |
| commit | fb4086cadb8ce3e473dae40558d713e7a31b3858 (patch) | |
| tree | 95c19d544da914c43a43f0538a1977f43e17cb39 /engines/gob | |
| parent | 7b070bbef8275ff25dfc2cbc3106acfdc8de74a5 (diff) | |
| parent | a17e3c444917ca90dfd537c2102a6150e7ffe977 (diff) | |
| download | scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.tar.gz scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.tar.bz2 scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.zip | |
Merged from trunk, from Rev 50841 to HEAD
svn-id: r51495
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/gob.cpp | 9 | ||||
| -rw-r--r-- | engines/gob/inter_playtoons.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/mult_v2.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 9c61bc1b75..03c0b1d991 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -126,8 +126,13 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst) { _pauseStart = 0; // Setup mixer - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); + bool muteSFX = ConfMan.getBool("mute") || ConfMan.getBool("sfx_mute"); + bool muteMusic = ConfMan.getBool("mute") || ConfMan.getBool("music_mute"); + + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, + muteSFX ? 0 : ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, + muteMusic ? 0 : ConfMan.getInt("music_volume")); _copyProtection = ConfMan.getBool("copy_protection"); diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp index c9b962579b..142467b47f 100644 --- a/engines/gob/inter_playtoons.cpp +++ b/engines/gob/inter_playtoons.cpp @@ -362,7 +362,6 @@ void Inter_Playtoons::oPlaytoons_getObjAnimSize() { int16 objIndex; uint16 readVar[4]; uint8 i; - bool break_fl; Mult::Mult_AnimData animData; _vm->_game->_script->evalExpr(&objIndex); @@ -375,7 +374,6 @@ void Inter_Playtoons::oPlaytoons_getObjAnimSize() { return; } if (objIndex == -2) { - break_fl = false; warning("oPlaytoons_getObjAnimSize case -2 not implemented"); return; } diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index 88b604023c..6acd096e58 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -1149,7 +1149,6 @@ void Mult_v2::playImd(const char *imdFile, Mult::Mult_ImdKey &key, int16 dir, void Mult_v2::advanceObjects(int16 index) { int16 frame; bool stop = false; - bool hasImds = false; frame = _multData->animKeysFrames[index]; if (frame == -1) @@ -1254,7 +1253,6 @@ void Mult_v2::advanceObjects(int16 index) { if ((dir != 1) && (--startFrame < 0)) startFrame = 0; - hasImds = true; playImd(imdFile, key, dir, startFrame); } } |