[Scummvm-cvs-logs] SF.net SVN: scummvm:[46494] scummvm/trunk/engines/sci/resource.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Wed Dec 23 13:39:24 CET 2009


Revision: 46494
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46494&view=rev
Author:   m_kiewitz
Date:     2009-12-23 12:39:24 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
SCI: sound resource handling fixed (fixes lsl5 music w/ new music code)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-12-23 09:44:13 UTC (rev 46493)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-12-23 12:39:24 UTC (rev 46494)
@@ -1852,6 +1852,9 @@
 					aTracks[i].nDigital = j;
 				ptr += 6;
 			}
+		} else {
+			// Skip over digital track
+			ptr += 6;
 		}
 		ptr++; // skipping 0xFF that closes channels list
 	}
@@ -1879,9 +1882,10 @@
 }
 
 SoundResource::tagTrack* SoundResource::getTrackByType(kTrackType type) {
-	for (int i = 0; i < nTracks; i++)
+	for (int i = 0; i < nTracks; i++) {
 		if (aTracks[i].type == type)
 			return &aTracks[i];
+	}
 	return NULL;
 }
 


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