[Scummvm-cvs-logs] SF.net SVN: scummvm:[42565] scummvm/trunk/engines/kyra/kyra_v1.cpp

[lordhoto at users.sourceforge.net]

Revision: 42565
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42565&view=rev
Author:   lordhoto
Date:     2009-07-17 14:05:22 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-07-17 13:50:59 UTC (rev 42564)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-07-17 14:05:22 UTC (rev 42565)
@@ -115,7 +115,6 @@
 				_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 @@
 			else
 				type = Sound::kMidiGM;
 
-
 			MidiDriver *driver = 0;
 
 			if (midiDriver == MD_PCSPK) {
@@ -151,9 +149,10 @@
 				assert(adlib);
 
 				_sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib);
-				assert(_sound);
 			}
 		}
+
+		assert(_sound);
 	}
 
 	if (_sound)


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