[Scummvm-cvs-logs] SF.net SVN: scummvm:[49395] scummvm/trunk/engines/mohawk/video.cpp

[mthreepwood at users.sourceforge.net]

Revision: 49395
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49395&view=rev
Author:   mthreepwood
Date:     2010-06-02 17:04:55 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
Fix a regression from r49377 - we should be checking against code in addition to index for duplicate MLST's.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/video.cpp

Modified: scummvm/trunk/engines/mohawk/video.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video.cpp	2010-06-02 15:31:20 UTC (rev 49394)
+++ scummvm/trunk/engines/mohawk/video.cpp	2010-06-02 17:04:55 UTC (rev 49395)
@@ -246,11 +246,11 @@
 
 		// We've found a match, add it
 		if (mlstRecord.index == mlstId) {
-			// Make sure we don't have a duplicate
+			// Make sure we don't have any duplicates
 			for (uint32 j = 0; j < _mlstRecords.size(); j++)
-				if (_mlstRecords[j].index == mlstId) {
+				if (_mlstRecords[j].index == mlstRecord.index || _mlstRecords[j].code == mlstRecord.code) {
 					_mlstRecords.remove_at(j);
-					break;
+					j--;
 				}
 
 			_mlstRecords.push_back(mlstRecord);


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