diff options
author | Matthew Hoops | 2011-02-23 13:00:09 -0500 |
---|---|---|
committer | Matthew Hoops | 2011-02-23 13:01:01 -0500 |
commit | 336186900df37cd201f6976674d2f53443074dee (patch) | |
tree | f626c1565f60d8e36565a3b59d376d90628db047 /engines/sci | |
parent | 5c9b1e6cbd254923e795495a992146362f49679a (diff) | |
download | scummvm-rg350-336186900df37cd201f6976674d2f53443074dee.tar.gz scummvm-rg350-336186900df37cd201f6976674d2f53443074dee.tar.bz2 scummvm-rg350-336186900df37cd201f6976674d2f53443074dee.zip |
SCI: Don't name a variable the same as its function
Silences a gcc warning
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/graphics/animate.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp index dd84a9a105..5f9c5b86d6 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); |