aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-07-17 14:05:22 +0000
committerJohannes Schickel2009-07-17 14:05:22 +0000
commit53756ef1d022a959b24c041e18f55eef34e60dd3 (patch)
treec1ed0c4f73fc38cbcfb6d5b54180487ce7579c33
parentc353e5389b98cc3d7753aa7bcb5b07d7efc4de0b (diff)
downloadscummvm-rg350-53756ef1d022a959b24c041e18f55eef34e60dd3.tar.gz
scummvm-rg350-53756ef1d022a959b24c041e18f55eef34e60dd3.tar.bz2
scummvm-rg350-53756ef1d022a959b24c041e18f55eef34e60dd3.zip
Cleanup.
svn-id: r42565
-rw-r--r--engines/kyra/kyra_v1.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 80872877d5..258d0c402f 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -115,7 +115,6 @@ Common::Error KyraEngine_v1::init() {
_sound = new SoundTownsPC98_v2(this, _mixer);
} else if (midiDriver == MD_ADLIB) {
_sound = new SoundAdlibPC(this, _mixer);
- assert(_sound);
} else {
Sound::kType type;
@@ -126,7 +125,6 @@ Common::Error KyraEngine_v1::init() {
else
type = Sound::kMidiGM;
-
MidiDriver *driver = 0;
if (midiDriver == MD_PCSPK) {
@@ -151,9 +149,10 @@ Common::Error KyraEngine_v1::init() {
assert(adlib);
_sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib);
- assert(_sound);
}
}
+
+ assert(_sound);
}
if (_sound)