[Scummvm-cvs-logs] SF.net SVN: scummvm:[52832] scummvm/branches/branch-1-2-0/engines/agi

[sev at users.sourceforge.net]

Revision: 52832
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52832&view=rev
Author:   sev
Date:     2010-09-20 21:19:09 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
AGI: Backport fix for bug #3061578: AGI: PCjr Mode Not Default

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/agi/agi.cpp
    scummvm/branches/branch-1-2-0/engines/agi/sound.cpp

Modified: scummvm/branches/branch-1-2-0/engines/agi/agi.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/agi/agi.cpp	2010-09-20 21:17:49 UTC (rev 52831)
+++ scummvm/branches/branch-1-2-0/engines/agi/agi.cpp	2010-09-20 21:19:09 UTC (rev 52832)
@@ -578,15 +578,15 @@
 	} else if (getPlatform() == Common::kPlatformCoCo3) {
 		_soundemu = SOUND_EMU_COCO3;
 	} else {
-		switch (MidiDriver::getMusicType(MidiDriver::detectDevice(MDT_PCSPK|MDT_ADLIB|MDT_PCJR|MDT_MIDI))) {
+		switch (MidiDriver::getMusicType(MidiDriver::detectDevice(MDT_PCSPK|MDT_AMIGA|MDT_PCJR|MDT_MIDI))) {
 		case MT_PCSPK:
 			_soundemu = SOUND_EMU_PC;
 			break;
 		case MT_PCJR:
 			_soundemu = SOUND_EMU_PCJR;
 			break;
-		case MT_ADLIB:
-			_soundemu = SOUND_EMU_NONE;
+		case MT_AMIGA:
+			_soundemu = SOUND_EMU_AMIGA;
 			break;
 		default:
 			_soundemu = SOUND_EMU_MIDI;

Modified: scummvm/branches/branch-1-2-0/engines/agi/sound.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/agi/sound.cpp	2010-09-20 21:17:49 UTC (rev 52831)
+++ scummvm/branches/branch-1-2-0/engines/agi/sound.cpp	2010-09-20 21:19:09 UTC (rev 52832)
@@ -173,11 +173,11 @@
 	_playingSound = -1;
 
 	switch (_vm->_soundemu) {
-	case SOUND_EMU_NONE:
 	case SOUND_EMU_AMIGA:
 	case SOUND_EMU_MAC:
 		_soundGen = new SoundGenSarien(_vm, pMixer);
 		break;
+	case SOUND_EMU_NONE:
 	case SOUND_EMU_PC:
 	case SOUND_EMU_PCJR:
 		_soundGen = new SoundGenPCJr(_vm, pMixer);


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