[Scummvm-git-logs] scummvm master -> 5d06607e8a7e0d5a444ea1ae93e985c4e3b4be34

sev- sev at scummvm.org
Tue Feb 28 10:38:39 CET 2017


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:
5d06607e8a DIRECTOR: Fix warning and code formatting


Commit: 5d06607e8a7e0d5a444ea1ae93e985c4e3b4be34
    https://github.com/scummvm/scummvm/commit/5d06607e8a7e0d5a444ea1ae93e985c4e3b4be34
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-28T10:38:16+01:00

Commit Message:
DIRECTOR: Fix warning and code formatting

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index f77bf5c..df03f99 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++;
 		}





More information about the Scummvm-git-logs mailing list