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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Thu Jul 3 23:09:08 CEST 2008


Revision: 32899
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32899&view=rev
Author:   athrxx
Date:     2008-07-03 14:09:07 -0700 (Thu, 03 Jul 2008)

Log Message:
-----------
minor fix for Towns/PC98 music

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_lok.cpp
    scummvm/trunk/engines/kyra/sound_lok.cpp

Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp	2008-07-03 19:42:04 UTC (rev 32898)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp	2008-07-03 21:09:07 UTC (rev 32899)
@@ -1083,7 +1083,7 @@
 	_screen->_charWidth = -1;
 
 	// we only need this for the fm-towns version
-	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
+	if (_flags.platform == Common::kPlatformFMTowns && _configMusic == 1)
 		snd_playWanderScoreViaMap(53, 1);
 
 	uint8 *buffer = 0;

Modified: scummvm/trunk/engines/kyra/sound_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_lok.cpp	2008-07-03 19:42:04 UTC (rev 32898)
+++ scummvm/trunk/engines/kyra/sound_lok.cpp	2008-07-03 21:09:07 UTC (rev 32899)
@@ -49,20 +49,23 @@
 		} else if (command >= 35 && command <= 38) {
 			snd_playSoundEffect(command-20);
 		} else if (command >= 2) {
-			if (_lastMusicCommand != command) {
+			if (_lastMusicCommand != command)
 				// the original does -2 here we handle this inside _sound->playTrack()
 				_sound->playTrack(command);
-			}
 		} else {
 			_sound->haltTrack();
 		}
+		_lastMusicCommand = command;
 	} else if (_flags.platform == Common::kPlatformPC98) {
-		if (command == 1)
+		if (command == 1) {
 			_sound->beginFadeOut();
-		else if (command >= 2)
-			_sound->playTrack(command);	
-		else
+		} else if (command >= 2) {
+			if (_lastMusicCommand != command)
+				_sound->playTrack(command);
+		} else {
 			_sound->haltTrack();
+		}
+		_lastMusicCommand = command;
 	} else {
 		KyraEngine_v1::snd_playWanderScoreViaMap(command, restart);
 	}


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