diff options
| author | Paul Gilbert | 2018-02-19 10:28:18 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-02-19 10:28:18 -0500 |
| commit | a282cea4921d7004b4a6360cdb4ed68c94345487 (patch) | |
| tree | e6fcd74c34868dfc559f3738ec5486f84f4cc9ce | |
| parent | 8fc4a08e04b947bc1ca01e716a7821fe41a03381 (diff) | |
| download | scummvm-rg350-a282cea4921d7004b4a6360cdb4ed68c94345487.tar.gz scummvm-rg350-a282cea4921d7004b4a6360cdb4ed68c94345487.tar.bz2 scummvm-rg350-a282cea4921d7004b4a6360cdb4ed68c94345487.zip | |
XEEN: Fix shadowed field warning in SpriteResource
| -rw-r--r-- | engines/xeen/sprites.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp index 2959d87b3d..ea0400b82f 100644 --- a/engines/xeen/sprites.cpp +++ b/engines/xeen/sprites.cpp @@ -352,7 +352,7 @@ uint SpriteResource::getScaledVal(int xy, uint16 &scaleMask) { Common::Point SpriteResource::getFrameSize(int frame) const { Common::MemoryReadStream f(_data, _filesize); - Common::Point size; + Common::Point frameSize; for (int idx = 0; idx < (_index[frame]._offset2 ? 2 : 1); ++idx) { f.seek((idx == 0) ? _index[frame]._offset1 : _index[frame]._offset2); @@ -361,11 +361,11 @@ Common::Point SpriteResource::getFrameSize(int frame) const { int yOffset = f.readUint16LE(); int height = f.readUint16LE(); - size.x = MAX((int)size.x, xOffset + width); - size.y = MAX((int)size.y, yOffset + height); + frameSize.x = MAX((int)frameSize.x, xOffset + width); + frameSize.y = MAX((int)frameSize.y, yOffset + height); } - return size; + return frameSize; } } // End of namespace Xeen |