diff options
| author | Eugene Sandulenko | 2013-11-13 00:12:04 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-11-13 00:20:30 +0200 |
| commit | 69378e35d83c98975e1dddea0a2ecae4f13811a4 (patch) | |
| tree | a87a36fb583996f90362965c584ce047c7b61715 | |
| parent | 575f81da5f11e7b73236beeca5518f4fd054516d (diff) | |
| download | scummvm-rg350-69378e35d83c98975e1dddea0a2ecae4f13811a4.tar.gz scummvm-rg350-69378e35d83c98975e1dddea0a2ecae4f13811a4.tar.bz2 scummvm-rg350-69378e35d83c98975e1dddea0a2ecae4f13811a4.zip | |
FULLPIPE: More work on MovGraph2::buildMovInfo1MessageQueue()
| -rw-r--r-- | engines/fullpipe/motion.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 2d36f9de25..256d48afb6 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -676,14 +676,14 @@ MessageQueue *MovGraph2::buildMovInfo1MessageQueue(MovInfo1 *movInfo) { if (v10 != 10) { if (i >= movInfo->_itemsCount - 2 || v9[i + 2].subIndex != 10) { v16 = v9[i].subIndex; - v17 = (char *)this->items[1] + 16 * (v10 + 8); + v17 = (char *)_items[1] + 16 * (v10 + 8); subidx = 93 * movInfo->field_0; movinfo.flags = 0; v14 = 8 * subidx; v15 = (MovGraph2Item *)(&v17[184 * v16] + v14); } else { v11 = v9[i].subIndex; - v12 = (char *)this->items[1] + 16 * (v10 + 4); + v12 = (char *)_items[1] + 16 * (v10 + 4); v13 = 93 * movInfo->field_0; movinfo.flags = 2; v14 = 8 * v13; @@ -757,20 +757,20 @@ MessageQueue *MovGraph2::buildMovInfo1MessageQueue(MovInfo1 *movInfo) { || v9[i + 2].subIndex == v9[i + 3].subIndex) { movinfo.flags &= 3; } else { - v35 = (MovInfo1 *)((char *)&this->items[1][movInfo->field_0] + 184 * v9[i + 2].subIndex + 16 * (v9[i + 3].subIndex + 8)); + v35 = (MovInfo1 *)((char *)&_items[1][movInfo->field_0] + 184 * v9[i + 2].subIndex + 16 * (v9[i + 3].subIndex + 8)); movinfo.pt2.x -= v35->pt1.y; movinfo.pt2.y -= v35->pt2.x; movinfo.flags &= 3; } } else { - v32 = (MovInfo1 *)((char *)&this->items[1][movInfo->field_0] + 184 * v9[i + 2].subIndex + 16 * (v9[i + 3].subIndex + 4)); + v32 = (MovInfo1 *)((char *)&_items[1][movInfo->field_0] + 184 * v9[i + 2].subIndex + 16 * (v9[i + 3].subIndex + 4)); if (movinfo.item1Index && movinfo.item1Index != 1) { movinfo.pt2.y -= v32->pt2.x; - movinfo.flags = movinfo.flags & 2 | 1; + movinfo.flags = (movinfo.flags & 2) | 1; } else { movinfo.pt2.x -= v32->pt1.y; - movinfo.flags = movinfo.flags & 2 | 1; + movinfo.flags = (movinfo.flags & 2) | 1; } } i++; // intentional @@ -781,7 +781,8 @@ MessageQueue *MovGraph2::buildMovInfo1MessageQueue(MovInfo1 *movInfo) { delete mq; return 0; } - MessageQueue_transferExCommands(mq, v36); + + mq->transferExCommands(v36); delete v36; |