diff options
author | Eugene Sandulenko | 2017-02-28 10:38:16 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-02-28 10:38:16 +0100 |
commit | 5d06607e8a7e0d5a444ea1ae93e985c4e3b4be34 (patch) | |
tree | 03262795bcaaa2fc246410d471dd11ef4f04e5f0 | |
parent | b0093cba4bd750201c803d0e05e046801cb62684 (diff) | |
download | scummvm-rg350-5d06607e8a7e0d5a444ea1ae93e985c4e3b4be34.tar.gz scummvm-rg350-5d06607e8a7e0d5a444ea1ae93e985c4e3b4be34.tar.bz2 scummvm-rg350-5d06607e8a7e0d5a444ea1ae93e985c4e3b4be34.zip |
DIRECTOR: Fix warning and code formatting
-rw-r--r-- | engines/director/frame.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index f77bf5c8f8..df03f998cd 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -661,7 +661,7 @@ void Frame::renderShape(Graphics::ManagedSurface &surface, uint16 spriteId) { tmpSurface.frameRect(Common::Rect(rr, rr, shapeRect.width() - (rr * 2), shapeRect.height() - (rr * 2)), 0); } - addDrawRect(spriteId, shapeRect); + addDrawRect(spriteId, shapeRect); inkBasedBlit(surface, tmpSurface, spriteId, shapeRect); } @@ -1061,10 +1061,13 @@ void Frame::drawReverseSprite(Graphics::ManagedSurface &target, const Graphics:: byte *dst = (byte *)target.getBasePtr(drawRect.left, drawRect.top + ii); for (int j = 0; j < drawRect.width(); j++) { - if ((getSpriteIDFromPos(Common::Point(drawRect.left + j, drawRect.top + ii)) != 0)) - if (*src != skipColor) *dst = (*dst == *src ? (*src == 0 ? 0xff : 0) : *src); - else if (*src != skipColor) + if ((getSpriteIDFromPos(Common::Point(drawRect.left + j, drawRect.top + ii)) != 0)) { + if (*src != skipColor) { + *dst = (*dst == *src ? (*src == 0 ? 0xff : 0) : *src); + } + } else if (*src != skipColor) { *dst = *src; + } src++; dst++; } |