[Scummvm-cvs-logs] SF.net SVN: scummvm:[46610] scummvm/trunk/engines/sci/sfx/music.cpp

[thebluegr at users.sourceforge.net]

Revision: 46610
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46610&view=rev
Author:   thebluegr
Date:     2009-12-27 02:29:58 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
The state selector is only available in SCI0 games

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/music.cpp

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-27 01:49:39 UTC (rev 46609)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-27 02:29:58 UTC (rev 46610)
@@ -363,7 +363,8 @@
 				// FIXME: is there any other place this can be triggered properly?
 				SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan;
 				PUT_SEL32V(segMan, _playList[i]->soundObj, signal, SIGNAL_OFFSET);
-				PUT_SEL32V(segMan, _playList[i]->soundObj, state, kSndStatusStopped);
+				if (_soundVersion <= SCI_VERSION_0_LATE)
+					PUT_SEL32V(segMan, _playList[i]->soundObj, state, kSndStatusStopped);
 			} else {
 				_playList[i]->ticker = (uint16)(_pMixer->getSoundElapsedTime(
 						_playList[i]->hCurrentAud) * 0.06);
@@ -670,7 +671,8 @@
 				} else {
 					_pSnd->status = kSndStatusStopped;
 					PUT_SEL32V(segMan, _pSnd->soundObj, signal, 0xFFFF);
-					PUT_SEL32V(segMan, _pSnd->soundObj, state, kSndStatusStopped);
+					if (_soundVersion <= SCI_VERSION_0_LATE)
+						PUT_SEL32V(segMan, _pSnd->soundObj, state, kSndStatusStopped);
 					debugC(2, kDebugLevelSound, "signal EOT");
 				}
 			}


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