libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 16:59:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Fix shadowed field warning in SpriteResource

Browse Source
This commit is contained in:
Paul Gilbert 2018-02-19 10:28:18 -05:00
parent 8fc4a08e04
commit a282cea492
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/xeen/sprites.cpp
View File

@ -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