diff options
| author | Johannes Schickel | 2007-12-22 23:29:15 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2007-12-22 23:29:15 +0000 |
| commit | 0cbff0fc423587e38b72407aa60fc71aa8e00475 (patch) | |
| tree | f7b6b94cd328022543465489bfb134b2fa238c9c /engines/kyra | |
| parent | 019ad448223a0dc881737e5f7766142c3862765f (diff) | |
| download | scummvm-rg350-0cbff0fc423587e38b72407aa60fc71aa8e00475.tar.gz scummvm-rg350-0cbff0fc423587e38b72407aa60fc71aa8e00475.tar.bz2 scummvm-rg350-0cbff0fc423587e38b72407aa60fc71aa8e00475.zip | |
Logic fix for MixedSoundDriver::init.
svn-id: r29953
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/sound.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index e0c5398300..126ffca760 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -462,7 +462,7 @@ public: MixedSoundDriver(KyraEngine *vm, Audio::Mixer *mixer, Sound *music, Sound *sfx) : Sound(vm, mixer), _music(music), _sfx(sfx) {} ~MixedSoundDriver() { delete _music; delete _sfx; } - bool init() { return _music->init() | _sfx->init(); } + bool init() { return (_music->init() && _sfx->init()); } void process() { _music->process(); _sfx->process(); } void setVolume(int volume) { _music->setVolume(volume); _sfx->setVolume(volume); } |