[Scummvm-git-logs] scummvm master -> b1b03b18d35d59ad0d712c723a3d4f8c02dcfc18
bluegr
bluegr at gmail.com
Sun Sep 1 21:46:26 CEST 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b1b03b18d3 XEEN: Fix compiler warning
Commit: b1b03b18d35d59ad0d712c723a3d4f8c02dcfc18
https://github.com/scummvm/scummvm/commit/b1b03b18d35d59ad0d712c723a3d4f8c02dcfc18
Author: jepael (jepael at users.noreply.github.com)
Date: 2019-09-01T22:46:23+03:00
Commit Message:
XEEN: Fix compiler warning
Changed paths:
engines/xeen/sprites.cpp
diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index fdd1f32..d6d0cf5 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -134,33 +134,33 @@ void SpriteResource::draw(XSurface &dest, int frame, const Common::Point &destPo
r.clip(SCREEN_WIDTH, _clippedBottom);
// Create drawer to handle the rendering
- SpriteDrawer *draw;
+ SpriteDrawer *drawer;
switch (flags & SPRFLAG_MODE_MASK) {
case SPRFLAG_DRAWER1:
- draw = new SpriteDrawer1(_data, _filesize, flags & 0x1F);
+ drawer = new SpriteDrawer1(_data, _filesize, flags & 0x1F);
break;
case SPRFLAG_DRAWER2:
error("TODO: Sprite drawer mode 2");
case SPRFLAG_DRAWER3:
- draw = new SpriteDrawer3(_data, _filesize, flags & 0x1F);
+ drawer = new SpriteDrawer3(_data, _filesize, flags & 0x1F);
break;
case SPRFLAG_DRAWER5:
- draw = new SpriteDrawer5(_data, _filesize, flags & 0x1F);
+ drawer = new SpriteDrawer5(_data, _filesize, flags & 0x1F);
break;
case SPRFLAG_DRAWER6:
- draw = new SpriteDrawer6(_data, _filesize, flags & 0x1F);
+ drawer = new SpriteDrawer6(_data, _filesize, flags & 0x1F);
break;
default:
- draw = new SpriteDrawer(_data, _filesize);
+ drawer = new SpriteDrawer(_data, _filesize);
break;
}
// Sprites can consist of separate background & foreground
- draw->draw(dest, _index[frame]._offset1, destPos, r, flags, scale);
+ drawer->draw(dest, _index[frame]._offset1, destPos, r, flags, scale);
if (_index[frame]._offset2)
- draw->draw(dest, _index[frame]._offset2, destPos, r, flags, scale);
+ drawer->draw(dest, _index[frame]._offset2, destPos, r, flags, scale);
- delete draw;
+ delete drawer;
}
void SpriteResource::draw(XSurface &dest, int frame) {
More information about the Scummvm-git-logs
mailing list