[Scummvm-cvs-logs] SF.net SVN: scummvm:[45302] scummvm/trunk/engines/scumm/he/script_v90he.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Oct 21 11:59:18 CEST 2009


Revision: 45302
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45302&view=rev
Author:   fingolfin
Date:     2009-10-21 09:59:18 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
SCUMM: Get rid of 'static int sortArrayOffset' by tweaking ScummEngine_v90he::sortArray

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v90he.cpp

Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp	2009-10-21 08:54:03 UTC (rev 45301)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp	2009-10-21 09:59:18 UTC (rev 45302)
@@ -1948,41 +1948,39 @@
 	}
 }
 
-static int sortArrayOffset;
-
 static int compareByteArray(const void *a, const void *b) {
-	int va = *((const uint8 *)a + sortArrayOffset);
-	int vb = *((const uint8 *)a + sortArrayOffset);
+	int va = *((const uint8 *)a);
+	int vb = *((const uint8 *)a);
 	return va - vb;
 }
 
 static int compareByteArrayReverse(const void *a, const void *b) {
-	int va = *((const uint8 *)a + sortArrayOffset);
-	int vb = *((const uint8 *)a + sortArrayOffset);
+	int va = *((const uint8 *)a);
+	int vb = *((const uint8 *)a);
 	return vb - va;
 }
 
 static int compareIntArray(const void *a, const void *b) {
-	int va = (int16)READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
-	int vb = (int16)READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
+	int va = (int16)READ_LE_UINT16((const uint8 *)a);
+	int vb = (int16)READ_LE_UINT16((const uint8 *)b);
 	return va - vb;
 }
 
 static int compareIntArrayReverse(const void *a, const void *b) {
-	int va = (int16)READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
-	int vb = (int16)READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
+	int va = (int16)READ_LE_UINT16((const uint8 *)a);
+	int vb = (int16)READ_LE_UINT16((const uint8 *)b);
 	return vb - va;
 }
 
 static int compareDwordArray(const void *a, const void *b) {
-	int va = (int32)READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
-	int vb = (int32)READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
+	int va = (int32)READ_LE_UINT32((const uint8 *)a);
+	int vb = (int32)READ_LE_UINT32((const uint8 *)b);
 	return va - vb;
 }
 
 static int compareDwordArrayReverse(const void *a, const void *b) {
-	int va = (int32)READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
-	int vb = (int32)READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
+	int va = (int32)READ_LE_UINT32((const uint8 *)a);
+	int vb = (int32)READ_LE_UINT32((const uint8 *)b);
 	return vb - va;
 }
 
@@ -1996,8 +1994,8 @@
 
 	const int num = dim2end - dim2start + 1;
 	const int pitch = FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1;
-	const int offset = pitch * (dim2start - FROM_LE_32(ah->dim2start));
-	sortArrayOffset = dim1start - FROM_LE_32(ah->dim1start);
+	const int offset = pitch * (dim2start - FROM_LE_32(ah->dim2start))
+						+ dim1start - FROM_LE_32(ah->dim1start);
 
 	switch (FROM_LE_32(ah->type)) {
 	case kByteArray:


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