diff options
| author | Travis Howell | 2007-06-23 08:26:18 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-06-23 08:26:18 +0000 |
| commit | 55058015338f46f9c35afaecfef4d24dd198a363 (patch) | |
| tree | d0c95e65216ae8131819012455a4b0da7bf5ff60 /engines/agos | |
| parent | d36ca0f7a5c87e3f7ce6429454672fbd92b52cb7 (diff) | |
| download | scummvm-rg350-55058015338f46f9c35afaecfef4d24dd198a363.tar.gz scummvm-rg350-55058015338f46f9c35afaecfef4d24dd198a363.tar.bz2 scummvm-rg350-55058015338f46f9c35afaecfef4d24dd198a363.zip | |
Minor cleanup.
svn-id: r27649
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/icons.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index d1c58b68fb..3edcedaa8e 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -206,11 +206,11 @@ void AGOSEngine_Simon2::drawIcon(WindowBlock *window, uint icon, uint x, uint y) 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 @@ void AGOSEngine_Simon1::drawIcon(WindowBlock *window, uint icon, uint x, uint y) 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 @@ void AGOSEngine_Waxworks::drawIcon(WindowBlock *window, uint icon, uint x, uint 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 @@ void AGOSEngine_Elvira2::drawIcon(WindowBlock *window, uint icon, uint x, uint y 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 @@ void AGOSEngine::drawIcon(WindowBlock *window, uint icon, uint x, uint y) { 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; |