aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/exec_ns.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2008-01-30 23:09:18 +0000
committerFilippos Karapetis2008-01-30 23:09:18 +0000
commit289d18ed070765de3d392acf92d2d5dbfbc33dbd (patch)
treee7bd24b8965510da6c42701e56e3dd68099fa823 /engines/parallaction/exec_ns.cpp
parent5c6597562a0cc3fdfb621a8955a3b04f544b9ecf (diff)
downloadscummvm-rg350-289d18ed070765de3d392acf92d2d5dbfbc33dbd.tar.gz
scummvm-rg350-289d18ed070765de3d392acf92d2d5dbfbc33dbd.tar.bz2
scummvm-rg350-289d18ed070765de3d392acf92d2d5dbfbc33dbd.zip
Fix shadowing warning
svn-id: r30710
Diffstat (limited to 'engines/parallaction/exec_ns.cpp')
-rw-r--r--engines/parallaction/exec_ns.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index b2bc80e84c..6765da72c1 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -627,9 +627,9 @@ Zone *Parallaction::hitZone(uint32 type, uint16 x, uint16 y) {
int16 _a, _b, _c, _d, _e, _f;
- for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); it++) {
+ for (AnimationList::iterator ait = _animations.begin(); ait != _animations.end(); ait++) {
- Animation *a = *it;
+ Animation *a = *ait;
_a = (a->_flags & kFlagsActive) ? 1 : 0; // _a: active Animation
_e = ((_si >= a->_left + a->width()) || (_si <= a->_left)) ? 0 : 1; // _e: horizontal range