diff options
author | Arnaud Boutonné | 2011-01-18 21:32:18 +0000 |
---|---|---|
committer | Arnaud Boutonné | 2011-01-18 21:32:18 +0000 |
commit | 6a586881af7764918e2bb4da039ce9c0b03fc2ed (patch) | |
tree | 985c73db25415e5cf39d4734195d178967a69d13 /engines/hugo/object_v3d.cpp | |
parent | 4ad14abef3ea125a1cbc4939b3c5ed57bd8d58ab (diff) | |
download | scummvm-rg350-6a586881af7764918e2bb4da039ce9c0b03fc2ed.tar.gz scummvm-rg350-6a586881af7764918e2bb4da039ce9c0b03fc2ed.tar.bz2 scummvm-rg350-6a586881af7764918e2bb4da039ce9c0b03fc2ed.zip |
HUGO: Rename objNumb to objIndex when used as an index
svn-id: r55316
Diffstat (limited to 'engines/hugo/object_v3d.cpp')
-rw-r--r-- | engines/hugo/object_v3d.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/hugo/object_v3d.cpp b/engines/hugo/object_v3d.cpp index 4ca5b6a19e..1954830d81 100644 --- a/engines/hugo/object_v3d.cpp +++ b/engines/hugo/object_v3d.cpp @@ -248,23 +248,23 @@ void ObjectHandler_v3d::moveObjects() { * the assumption for now that the first obj is always the HERO) to the object * number of the swapped image */ -void ObjectHandler_v3d::swapImages(int objNumb1, int objNumb2) { - debugC(1, kDebugObject, "swapImages(%d, %d)", objNumb1, objNumb2); +void ObjectHandler_v3d::swapImages(int objIndex1, int objIndex2) { + debugC(1, kDebugObject, "swapImages(%d, %d)", objIndex1, objIndex2); - saveSeq(&_objects[objNumb1]); + saveSeq(&_objects[objIndex1]); seqList_t tmpSeqList[MAX_SEQUENCES]; int seqListSize = sizeof(seqList_t) * MAX_SEQUENCES; - memmove(tmpSeqList, _objects[objNumb1].seqList, seqListSize); - memmove(_objects[objNumb1].seqList, _objects[objNumb2].seqList, seqListSize); - memmove(_objects[objNumb2].seqList, tmpSeqList, seqListSize); - restoreSeq(&_objects[objNumb1]); - _objects[objNumb2].currImagePtr = _objects[objNumb2].seqList[0].seqPtr; - _vm->_heroImage = (_vm->_heroImage == HERO) ? objNumb2 : HERO; + memmove(tmpSeqList, _objects[objIndex1].seqList, seqListSize); + memmove(_objects[objIndex1].seqList, _objects[objIndex2].seqList, seqListSize); + memmove(_objects[objIndex2].seqList, tmpSeqList, seqListSize); + restoreSeq(&_objects[objIndex1]); + _objects[objIndex2].currImagePtr = _objects[objIndex2].seqList[0].seqPtr; + _vm->_heroImage = (_vm->_heroImage == HERO) ? objIndex2 : HERO; // Make sure baseline stays constant - _objects[objNumb1].y += _objects[objNumb2].currImagePtr->y2 - _objects[objNumb1].currImagePtr->y2; + _objects[objIndex1].y += _objects[objIndex2].currImagePtr->y2 - _objects[objIndex1].currImagePtr->y2; } } // End of namespace Hugo |