[Scummvm-cvs-logs] SF.net SVN: scummvm: [29953] scummvm/trunk/engines/kyra/sound.h

[lordhoto at users.sourceforge.net]

Revision: 29953
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29953&view=rev
Author:   lordhoto
Date:     2007-12-22 15:29:15 -0800 (Sat, 22 Dec 2007)

Log Message:
-----------
Logic fix for MixedSoundDriver::init.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.h

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2007-12-22 13:16:01 UTC (rev 29952)
+++ scummvm/trunk/engines/kyra/sound.h	2007-12-22 23:29:15 UTC (rev 29953)
@@ -462,7 +462,7 @@
 	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); }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.