[Scummvm-cvs-logs] SF.net SVN: scummvm:[40940] scummvm/trunk/engines/kyra/kyra_v1.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed May 27 16:44:27 CEST 2009
Revision: 40940
http://scummvm.svn.sourceforge.net/scummvm/?rev=40940&view=rev
Author: lordhoto
Date: 2009-05-27 14:44:26 +0000 (Wed, 27 May 2009)
Log Message:
-----------
Prevent accidental MT-32 initialization for PC speaker output, when "native_mt32" is set to true.
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-05-27 14:40:37 UTC (rev 40939)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-05-27 14:44:26 UTC (rev 40940)
@@ -121,10 +121,10 @@
} else {
Sound::kType type;
- if (midiDriver == MD_MT32 || ConfMan.getBool("native_mt32"))
+ if (midiDriver == MD_PCSPK)
+ type = Sound::kPCSpkr;
+ else if (midiDriver == MD_MT32 || ConfMan.getBool("native_mt32"))
type = Sound::kMidiMT32;
- else if (midiDriver == MD_PCSPK)
- type = Sound::kPCSpkr;
else
type = Sound::kMidiGM;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list