[Scummvm-cvs-logs] SF.net SVN: scummvm:[38345] scummvm/trunk/engines/scumm/scumm.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Mon Feb 16 07:23:42 CET 2009


Revision: 38345
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38345&view=rev
Author:   Kirben
Date:     2009-02-16 06:23:41 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
Limit platforms to specific SCUMM versions, when selecting the music engine to be used. To help prevent issues, if user manually selects the incorrect platform.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2009-02-16 06:11:37 UTC (rev 38344)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2009-02-16 06:23:41 UTC (rev 38345)
@@ -1627,25 +1627,32 @@
 	// Init iMuse
 	if (_game.version >= 7) {
 		// Setup for digital iMuse is performed in another place
-	} else if (_game.platform == Common::kPlatformApple2GS || _game.platform == Common::kPlatformC64 ||
-		_game.platform == Common::kPlatformPCEngine) {
-		// TODO
+	} else if (_game.platform == Common::kPlatformApple2GS && _game.version == 0){
+		// TODO: Add support for music format
 		_musicEngine = NULL;
-	} else if (_game.platform == Common::kPlatformNES) {
+	} else if (_game.platform == Common::kPlatformC64 && _game.version <= 1) {
+		// TODO: Add support for music format
+		_musicEngine = NULL;
+	} else if (_game.platform == Common::kPlatformNES && _game.version == 1) {
 		_musicEngine = new Player_NES(this, _mixer);
-	} else if ((_game.platform == Common::kPlatformAmiga) && (_game.version == 2)) {
+	} else if (_game.platform == Common::kPlatformAmiga && _game.version == 2) {
 		_musicEngine = new Player_V2A(this, _mixer);
-	} else if ((_game.platform == Common::kPlatformAmiga) && (_game.version == 3)) {
+	} else if (_game.platform == Common::kPlatformAmiga && _game.version == 3) {
 		_musicEngine = new Player_V3A(this, _mixer);
-	} else if ((_game.platform == Common::kPlatformAmiga) && (_game.version <= 4)) {
+	} else if (_game.platform == Common::kPlatformPCEngine && _game.version == 3) {
+		// TODO: Add support for music format
 		_musicEngine = NULL;
-	} else if (_game.id == GID_MANIAC && (_game.version == 1)) {
+	} else if (_game.platform == Common::kPlatformAmiga && _game.version <= 4) {
+		_musicEngine = NULL;
+	} else if (_game.id == GID_MANIAC && _game.version == 1) {
 		_musicEngine = new Player_V1(this, _mixer, midiDriver != MD_PCSPK);
 	} else if (_game.version <= 2) {
 		_musicEngine = new Player_V2(this, _mixer, midiDriver != MD_PCSPK);
-	} else if ((_musicType == MDT_PCSPK) && ((_game.version > 2) && (_game.version <= 4))) {
+	} else if ((_musicType == MDT_PCSPK) && (_game.version > 2 && _game.version <= 4)) {
 		_musicEngine = new Player_V2(this, _mixer, midiDriver != MD_PCSPK);
-	} else if (_game.version >= 3 && _game.heversion <= 61 && _game.platform != Common::kPlatform3DO) {
+	} else if (_game.platform == Common::kPlatform3DO && _game.heversion == 61) {
+		// 3DO versions use digital music and sound samples.
+	} else if (_game.version >= 3 && _game.heversion <= 61) {
 		MidiDriver *nativeMidiDriver = 0;
 		MidiDriver *adlibMidiDriver = 0;
 


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