[Scummvm-cvs-logs] SF.net SVN: scummvm: [27649] scummvm/trunk/engines/agos/icons.cpp

[Kirben at users.sourceforge.net]

Revision: 27649
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27649&view=rev
Author:   Kirben
Date:     2007-06-23 01:26:18 -0700 (Sat, 23 Jun 2007)

Log Message:
-----------
Minor cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/icons.cpp

Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp	2007-06-23 07:49:17 UTC (rev 27648)
+++ scummvm/trunk/engines/agos/icons.cpp	2007-06-23 08:26:18 UTC (rev 27649)
@@ -206,11 +206,11 @@
 	dst += (y + window->y) * _dxSurfacePitch;
 
 	src = _iconFilePtr;
-	src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 0]);
+	src += READ_LE_UINT16(src + icon * 4 + 0);
 	decompressIcon(dst, src, 20, 10, 224, _dxSurfacePitch);
 
 	src = _iconFilePtr;
-	src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 1]);
+	src += READ_LE_UINT16(src + icon * 4 + 2);
 	decompressIcon(dst, src, 20, 10, 208, _dxSurfacePitch);
 
 	_system->unlockScreen();
@@ -232,12 +232,12 @@
 
 	if (getPlatform() == Common::kPlatformAmiga) {
 		src = _iconFilePtr;
-		src += READ_BE_UINT32(&((uint32 *)src)[icon]);
+		src += READ_BE_UINT32(src + icon * 4);
 		uint8 color = (getFeatures() & GF_32COLOR) ? 16 : 240;
 		decompressIconPlanar(dst, src, 24, 12, color, _dxSurfacePitch);
 	} else {
 		src = _iconFilePtr;
-		src += READ_LE_UINT16(&((uint16 *)src)[icon]);
+		src += READ_LE_UINT16(src + icon * 2);
 		decompressIcon(dst, src, 24, 12, 224, _dxSurfacePitch);
 	}
 
@@ -261,11 +261,11 @@
 	uint8 color = dst[0] & 0xF0;
 	if (getPlatform() == Common::kPlatformAmiga) {
 		src = _iconFilePtr;
-		src += READ_BE_UINT32(&((uint32 *)src)[icon]);
+		src += READ_BE_UINT32(src + icon * 4);
 		decompressIconPlanar(dst, src, 24, 10, color, _dxSurfacePitch);
 	} else {
 		src = _iconFilePtr;
-		src += READ_LE_UINT16(&((uint16 *)src)[icon]);
+		src += READ_LE_UINT16(src + icon * 2);
 		decompressIcon(dst, src, 24, 10, color, _dxSurfacePitch);
 	}
 
@@ -289,11 +289,11 @@
 	uint color = dst[0] & 0xF0;
 	if (getFeatures() & GF_PLANAR) {
 		src = _iconFilePtr;
-		src += READ_BE_UINT32(&((uint32 *)src)[icon]);
+		src += READ_BE_UINT32(src + icon * 4);
 		decompressIconPlanar(dst, src, 24, 12, color, _dxSurfacePitch);
 	} else {
 		src = _iconFilePtr;
-		src += READ_LE_UINT16(&((uint16 *)src)[icon]);
+		src += READ_LE_UINT16(src + icon * 2);
 		decompressIcon(dst, src, 24, 12, color, _dxSurfacePitch);
 	}
 
@@ -316,7 +316,7 @@
 
 	if (getFeatures() & GF_PLANAR) {
 		src = _iconFilePtr;
-		src += READ_BE_UINT16(&((uint16 *)src)[icon]);
+		src += READ_BE_UINT16(src + icon * 2);
 		decompressIconPlanar(dst, src, 24, 12, 16, _dxSurfacePitch);
 	} else {
 		src = _iconFilePtr;


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