[Scummvm-cvs-logs] scummvm master -> 336186900df37cd201f6976674d2f53443074dee

clone2727 clone2727 at gmail.com
Wed Feb 23 19:01:35 CET 2011


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:
336186900d SCI: Don't name a variable the same as its function


Commit: 336186900df37cd201f6976674d2f53443074dee
    https://github.com/scummvm/scummvm/commit/336186900df37cd201f6976674d2f53443074dee
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-02-23T10:01:01-08:00

Commit Message:
SCI: Don't name a variable the same as its function

Silences a gcc warning

Changed paths:
    engines/sci/graphics/animate.cpp



diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp
index dd84a9a..5f9c5b8 100644
--- a/engines/sci/graphics/animate.cpp
+++ b/engines/sci/graphics/animate.cpp
@@ -297,14 +297,14 @@ void GfxAnimate::applyGlobalScaling(AnimateList::iterator entry, GfxView *view)
 }
 
 void GfxAnimate::setNsRect(GfxView *view, AnimateList::iterator it) {
-	bool setNsRect = true;
+	bool shouldSetNsRect = true;
 
 	// Create rect according to coordinates and given cel
 	if (it->scaleSignal & kScaleSignalDoScaling) {
 		view->getCelScaledRect(it->loopNo, it->celNo, it->x, it->y, it->z, it->scaleX, it->scaleY, it->celRect);
 		// when being scaled, only set nsRect, if object will get drawn
 		if ((it->signal & kSignalHidden) && !(it->signal & kSignalAlwaysUpdate))
-			setNsRect = false;
+			shouldSetNsRect = false;
 	} else {
 		//  This special handling is not included in the other SCI1.1 interpreters and MUST NOT be
 		//  checked in those cases, otherwise we will break games (e.g. EcoQuest 2, room 200)
@@ -314,13 +314,13 @@ void GfxAnimate::setNsRect(GfxView *view, AnimateList::iterator it) {
 			it->celRect.right = readSelectorValue(_s->_segMan, it->object, SELECTOR(nsRight));
 			it->celRect.bottom = readSelectorValue(_s->_segMan, it->object, SELECTOR(nsBottom));
 			view->getCelSpecialHoyle4Rect(it->loopNo, it->celNo, it->x, it->y, it->z, it->celRect);
-			setNsRect = false;
+			shouldSetNsRect = false;
 		} else {
 			view->getCelRect(it->loopNo, it->celNo, it->x, it->y, it->z, it->celRect);
 		}
 	}
 
-	if (setNsRect) {
+	if (shouldSetNsRect) {
 		writeSelectorValue(_s->_segMan, it->object, SELECTOR(nsLeft), it->celRect.left);
 		writeSelectorValue(_s->_segMan, it->object, SELECTOR(nsTop), it->celRect.top);
 		writeSelectorValue(_s->_segMan, it->object, SELECTOR(nsRight), it->celRect.right);






More information about the Scummvm-git-logs mailing list