[Scummvm-cvs-logs] SF.net SVN: scummvm:[38316] scummvm/trunk/engines/tinsel/polygons.cpp

[joostp at users.sourceforge.net]

Revision: 38316
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38316&view=rev
Author:   joostp
Date:     2009-02-15 22:25:34 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Proper endianness handling in MatchingLevels().
Fixes #2603000 "DW2: Long pause entering Shades (big endian)"

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/polygons.cpp

Modified: scummvm/trunk/engines/tinsel/polygons.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/polygons.cpp	2009-02-15 22:15:48 UTC (rev 38315)
+++ scummvm/trunk/engines/tinsel/polygons.cpp	2009-02-15 22:25:34 UTC (rev 38316)
@@ -1336,11 +1336,11 @@
 	Poly pp1(pps, p1->pIndex);	// This polygon 1
 	Poly pp2(pps, p2->pIndex);	// This polygon 2
 
-	assert(pp1.level1 <= pp1.level2);
-	assert(pp2.level1 <= pp2.level2);
+	assert((int32)FROM_LE_32(pp1.level1) <= (int32)FROM_LE_32(pp1.level2));
+	assert((int32)FROM_LE_32(pp2.level1) <= (int32)FROM_LE_32(pp2.level2));
 
-	for (int pl = pp1.level1; pl <= pp1.level2; pl++) {
-		if (pl >= pp2.level1 && pl <= pp2.level2)
+	for (int pl = (int32)FROM_LE_32(pp1.level1); pl <= (int32)FROM_LE_32(pp1.level2); pl++) {
+		if (pl >= (int32)FROM_LE_32(pp2.level1) && pl <= (int32)FROM_LE_32(pp2.level2))
 			return true;
 	}
 


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