diff --git a/engines/fullpipe/anihandler.cpp b/engines/fullpipe/anihandler.cpp index dc1e15238c82..060047975a3f 100644 --- a/engines/fullpipe/anihandler.cpp +++ b/engines/fullpipe/anihandler.cpp @@ -94,7 +94,7 @@ MessageQueue *AniHandler::makeQueue(StaticANIObject *ani, int staticsIndex, int ex = new ExCommand(ani->_id, 1, _items[idx]->subItems[subidx]->movement->_id, 0, 0, 0, 1, 0, 0, 0); } - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; ex->_field_3C = 1; ex->_field_24 = 1; @@ -350,7 +350,7 @@ MessageQueue *AniHandler::makeRunQueue(MakeQueueStruct *mkQueue) { ex2 = createCommand(s->movement, mkQueue->ani->_id, x1, y1, &x2, &y2, -1); ex2->_parId = mq->_id; - ex2->_param = mkQueue->ani->_okeyCode; + ex2->_param = mkQueue->ani->_odelay; mq->addExCommandToEnd(ex2); @@ -367,7 +367,7 @@ MessageQueue *AniHandler::makeRunQueue(MakeQueueStruct *mkQueue) { ex2 = createCommand(mov, mkQueue->ani->_id, x1, y1, &x2, &y2, plen); ex2->_parId = mq->_id; - ex2->_param = mkQueue->ani->_okeyCode; + ex2->_param = mkQueue->ani->_odelay; mq->addExCommandToEnd(ex2); } @@ -377,7 +377,7 @@ MessageQueue *AniHandler::makeRunQueue(MakeQueueStruct *mkQueue) { ex2 = createCommand(s->movement, mkQueue->ani->_id, x1, y1, &x2, &y2, -1); ex2->_parId = mq->_id; - ex2->_param = mkQueue->ani->_okeyCode; + ex2->_param = mkQueue->ani->_odelay; mq->addExCommandToEnd(ex2); @@ -387,7 +387,7 @@ MessageQueue *AniHandler::makeRunQueue(MakeQueueStruct *mkQueue) { ExCommand *ex = new ExCommand(mkQueue->ani->_id, 5, -1, mkQueue->x1, mkQueue->y1, 0, 1, 0, 0, 0); ex->_field_14 = mkQueue->field_1C; - ex->_param = mkQueue->ani->_okeyCode; + ex->_param = mkQueue->ani->_odelay; ex->_field_24 = 0; ex->_excFlags |= 3; diff --git a/engines/fullpipe/behavior.cpp b/engines/fullpipe/behavior.cpp index 1afa583120f8..d0de11bd8ce8 100644 --- a/engines/fullpipe/behavior.cpp +++ b/engines/fullpipe/behavior.cpp @@ -181,7 +181,7 @@ void BehaviorManager::updateStaticAniBehavior(StaticANIObject *ani, int delay, B } if (mq) { - mq->setParamInt(-1, ani->_okeyCode); + mq->setParamInt(-1, ani->_odelay); mq->chain(ani); } } diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp index 2e941c90f013..547b6cf5dbe4 100644 --- a/engines/fullpipe/gfx.cpp +++ b/engines/fullpipe/gfx.cpp @@ -95,7 +95,7 @@ bool Background::load(MfcArchive &file) { } void Background::addPictureObject(PictureObject *pct) { - if (pct->_okeyCode) + if (pct->_odelay) pct->renumPictures(&_picObjList); bool inserted = false; @@ -206,7 +206,7 @@ bool PictureObject::setPicAniInfo(PicAniInfo *picAniInfo) { if (picAniInfo->type & 2) { setOXY(picAniInfo->ox, picAniInfo->oy); _priority = picAniInfo->priority; - _okeyCode = picAniInfo->field_8; + _odelay = picAniInfo->field_8; setFlags(picAniInfo->flags); _field_8 = picAniInfo->field_24; @@ -251,7 +251,7 @@ void PictureObject::setOXY2() { } GameObject::GameObject() { - _okeyCode = 0; + _odelay = 0; _flags = 0; _id = 0; _ox = 0; @@ -263,7 +263,7 @@ GameObject::GameObject() { } GameObject::GameObject(GameObject *src) { - _okeyCode = 1; + _odelay = 1; _flags = 0; _id = src->_id; @@ -283,7 +283,7 @@ GameObject::~GameObject() { bool GameObject::load(MfcArchive &file) { debugC(5, kDebugLoading, "GameObject::load()"); - _okeyCode = 0; + _odelay = 0; _flags = 0; _field_20 = 0; @@ -311,14 +311,14 @@ void GameObject::renumPictures(Common::Array *lst) { for (uint i = 0; i < lst->size(); i++) { if (_id == ((GameObject *)((*lst)[i]))->_id) - buf[((GameObject *)((*lst)[i]))->_okeyCode] = 1; + buf[((GameObject *)((*lst)[i]))->_odelay] = 1; } - if (buf[_okeyCode]) { + if (buf[_odelay]) { uint count; for (count = 1; buf[count] && count < lst->size() + 2; count++) ; - _okeyCode = count; + _odelay = count; } free(buf); @@ -329,14 +329,14 @@ void GameObject::renumPictures(Common::Array *lst) { for (uint i = 0; i < lst->size(); i++) { if (_id == ((GameObject *)((*lst)[i]))->_id) - buf[((GameObject *)((*lst)[i]))->_okeyCode] = 1; + buf[((GameObject *)((*lst)[i]))->_odelay] = 1; } - if (buf[_okeyCode]) { + if (buf[_odelay]) { uint count; for (count = 1; buf[count] && count < lst->size() + 2; count++) ; - _okeyCode = count; + _odelay = count; } free(buf); @@ -347,7 +347,7 @@ bool GameObject::getPicAniInfo(PicAniInfo *info) { info->type = 2; info->objectId = _id; info->sceneId = 0; - info->field_8 = _okeyCode; + info->field_8 = _odelay; info->flags = _flags; info->field_24 = _field_8; info->ox = _ox; @@ -362,7 +362,7 @@ bool GameObject::getPicAniInfo(PicAniInfo *info) { info->type = (ani->_messageQueueId << 16) | 1; info->objectId = ani->_id; - info->field_8 = ani->_okeyCode; + info->field_8 = ani->_odelay; info->sceneId = ani->_sceneId; info->flags = ani->_flags; info->field_24 = ani->_field_8; @@ -401,7 +401,7 @@ bool GameObject::setPicAniInfo(PicAniInfo *picAniInfo) { if (picAniInfo->type & 2) { setOXY(picAniInfo->ox, picAniInfo->oy); _priority = picAniInfo->priority; - _okeyCode = picAniInfo->field_8; + _odelay = picAniInfo->field_8; setFlags(picAniInfo->flags); _field_8 = picAniInfo->field_24; @@ -412,7 +412,7 @@ bool GameObject::setPicAniInfo(PicAniInfo *picAniInfo) { StaticANIObject *ani = (StaticANIObject *)this; ani->_messageQueueId = (picAniInfo->type >> 16) & 0xffff; - ani->_okeyCode = picAniInfo->field_8; + ani->_odelay = picAniInfo->field_8; ani->setFlags(picAniInfo->flags); ani->_field_8 = picAniInfo->field_24; diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h index d94dd40452d4..cbba550041b7 100644 --- a/engines/fullpipe/gfx.h +++ b/engines/fullpipe/gfx.h @@ -123,7 +123,7 @@ class BigPicture : public Picture { class GameObject : public CObject { public: - int16 _okeyCode; + int16 _odelay; int _field_8; int16 _flags; int16 _id; diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index 7620f926fe3b..6bbf98e37b85 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -188,8 +188,8 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject ex = new ExCommand((subj ? subj->_id : 0), 55, 0, 0, 0, 0, 1, 0, 0, 0); ex->_x = obj->_id; - ex->_y = obj->_okeyCode; - ex->_param = subj ? subj->_okeyCode : 0; + ex->_y = obj->_odelay; + ex->_param = subj ? subj->_odelay : 0; ex->_excFlags = 3; ex->_field_14 = (obj->_objtype != kObjTypePictureObject); ex->_field_20 = invId; @@ -205,7 +205,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject LABEL_38: if (inter->_messageQueue) { mq = new MessageQueue(inter->_messageQueue, 0, 1); - mq->changeParam28ForObjectId(ani->_id, -1, ani->_okeyCode); + mq->changeParam28ForObjectId(ani->_id, -1, ani->_odelay); if (!mq->chain(0)) return false; @@ -253,12 +253,12 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject subj->setOXY(inter->_xOffs + obj->_ox, inter->_yOffs + obj->_oy); mq = new MessageQueue(inter->_messageQueue, 0, 1); - mq->changeParam28ForObjectId(obj->_id, -1, obj->_okeyCode); + mq->changeParam28ForObjectId(obj->_id, -1, obj->_odelay); mq->_flags |= 1; if (!(inter->_flags & 0x10000)) { ex = new ExCommand(obj->_id, 34, 0x80, 0, 0, 0, 1, 0, 0, 0); - ex->_param = obj->_okeyCode; + ex->_param = obj->_odelay; ex->_field_14 = 0x100; ex->_messageNum = 0; ex->_excFlags = 3; @@ -266,14 +266,14 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject } ex = new ExCommand(obj->_id, 34, 0x100, 0, 0, 0, 1, 0, 0, 0); - ex->_param = obj->_okeyCode; + ex->_param = obj->_odelay; ex->_field_14 = 0x100; ex->_messageNum = 0; ex->_excFlags = 3; mq->addExCommandToEnd(ex); ex = new ExCommand(subj->_id, 34, 0x100, 0, 0, 0, 1, 0, 0, 0); - ex->_param = subj->_okeyCode; + ex->_param = subj->_odelay; ex->_field_14 = 0x100; ex->_messageNum = 0; ex->_excFlags = 3; @@ -319,8 +319,8 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject ex = new ExCommand(subj->_id, 55, 0, 0, 0, 0, 1, 0, 0, 0); ex->_x = obj->_id; - ex->_y = obj->_okeyCode; - ex->_param = subj->_okeyCode; + ex->_y = obj->_odelay; + ex->_param = subj->_odelay; ex->_excFlags = 3; ex->_field_20 = invId; ex->_field_14 = (obj->_objtype != kObjTypePictureObject); @@ -334,7 +334,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject ex->_excFlags |= 3; ex->_param = 6; ex->_field_14 = obj->_id; - ex->_field_20 = obj->_okeyCode; + ex->_field_20 = obj->_odelay; ex->postMessage(); } @@ -362,21 +362,21 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject } else { ex = new ExCommand(ani->_id, 34, 0x80, 0, 0, 0, 1, 0, 0, 0); ex->_field_14 = 0x80; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; ex->_excFlags = 3; mq->addExCommandToEnd(ex); } } ex = new ExCommand(ani->_id, 34, 0x100, 0, 0, 0, 1, 0, 0, 0); - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; ex->_field_14 = 0x100; ex->_excFlags = 3; mq->addExCommandToEnd(ex); } else { ex = new ExCommand(subj->_id, 55, 0, 0, 0, 0, 1, 0, 0, 0); ex->_x = ani->_id; - ex->_y = ani->_okeyCode; - ex->_param = subj->_okeyCode; + ex->_y = ani->_odelay; + ex->_param = subj->_odelay; ex->_excFlags = 2; ex->_field_14 = (obj->_objtype != kObjTypePictureObject); ex->_field_20 = invId; diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp index b207ab16570f..13ac78a35802 100644 --- a/engines/fullpipe/inventory.cpp +++ b/engines/fullpipe/inventory.cpp @@ -231,7 +231,7 @@ void Inventory2::rebuildItemRects() { for (uint j = 0; j < _itemsPool.size(); j++) { if (_itemsPool[j]->pictureObjectNormal == pic->_id) { - if (pic->_okeyCode) + if (pic->_odelay) _scene->deletePictureObject(pic); else pic->_flags &= 0xFFFB; diff --git a/engines/fullpipe/lift.cpp b/engines/fullpipe/lift.cpp index c64e7b67fac1..10b41546b577 100644 --- a/engines/fullpipe/lift.cpp +++ b/engines/fullpipe/lift.cpp @@ -240,23 +240,23 @@ void FullpipeEngine::lift_exitSeq(ExCommand *cmd) { if (!cmd) { ex = new ExCommand(_aniMan->_id, 2, 40, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _aniMan->_okeyCode; + ex->_param = _aniMan->_odelay; ex->_excFlags |= 2; mq->addExCommandToEnd(ex); } ex = new ExCommand(_lift->_id, 1, MV_LFT_OPEN, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _lift->_okeyCode; + ex->_param = _lift->_odelay; ex->_excFlags |= 2; mq->addExCommandToEnd(ex); ex = new ExCommand(_aniMan->_id, 1, MV_MAN_STARTD, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _aniMan->_okeyCode; + ex->_param = _aniMan->_odelay; ex->_excFlags |= 2; mq->addExCommandToEnd(ex); ex = new ExCommand(_aniMan->_id, 5, -1, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _aniMan->_okeyCode; + ex->_param = _aniMan->_odelay; ex->_field_14 = 10; ex->_x = -1; ex->_y = -1; @@ -274,7 +274,7 @@ void FullpipeEngine::lift_exitSeq(ExCommand *cmd) { mq->addExCommandToEnd(ex); ex = new ExCommand(_lift->_id, 1, MV_LFT_CLOSE, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _lift->_okeyCode; + ex->_param = _lift->_odelay; ex->_excFlags |= 2; mq->addExCommandToEnd(ex); @@ -340,12 +340,12 @@ void FullpipeEngine::lift_walkAndGo() { mq->setFlags(mq->getFlags() | 1); ex = new ExCommand(_aniMan->_id, 2, 15, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _aniMan->_okeyCode; + ex->_param = _aniMan->_odelay; ex->_excFlags |= 2; mq->addExCommand(ex); ex = new ExCommand(_aniMan->_id, 5, -1, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _aniMan->_okeyCode; + ex->_param = _aniMan->_odelay; ex->_field_14 = _lift->_priority + 1; ex->_x = -1; ex->_y = -1; diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp index dcc7919a9852..ec015972444d 100644 --- a/engines/fullpipe/messagehandlers.cpp +++ b/engines/fullpipe/messagehandlers.cpp @@ -221,7 +221,7 @@ int global_messageHandler1(ExCommand *cmd) { } if (newex) { - newex->_param = g_fp->_aniMan->_okeyCode; + newex->_param = g_fp->_aniMan->_odelay; newex->_excFlags |= 3; newex->postMessage(); } @@ -397,7 +397,7 @@ int global_messageHandler3(ExCommand *cmd) { ani2 = g_fp->_currentScene->getStaticANIObject1ById(g_fp->_gameLoader->_field_FA, -1); if (ani) { - if (g_fp->_msgObjectId2 == ani->_id && g_fp->_msgId == ani->_okeyCode) { + if (g_fp->_msgObjectId2 == ani->_id && g_fp->_msgId == ani->_odelay) { cmd->_messageKind = 0; return result; } @@ -409,7 +409,7 @@ int global_messageHandler3(ExCommand *cmd) { int id = g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY); PictureObject *pic = g_fp->_currentScene->getPictureObjectById(id, 0); if (pic) { - if (g_fp->_msgObjectId2 == pic->_id && g_fp->_msgId == pic->_okeyCode) { + if (g_fp->_msgObjectId2 == pic->_id && g_fp->_msgId == pic->_odelay) { cmd->_messageKind = 0; return result; } diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index a84baa64b62d..490e593bbc84 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -225,7 +225,7 @@ MessageQueue *MctlCompound::startMove(StaticANIObject *ani, int sourceX, int sou ex->_excFlags |= 2; ex->_field_20 = fuzzyMatch; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); @@ -293,7 +293,7 @@ MessageQueue *MctlCompound::makeQueue(StaticANIObject *subj, int xpos, int ypos, ex = new ExCommand(subj->_id, 51, 0, xpos, ypos, 0, 1, 0, 0, 0); ex->_field_20 = fuzzyMatch; - ex->_param = subj->_okeyCode; + ex->_param = subj->_odelay; ex->_excFlags |= 2; mq->addExCommandToEnd(ex); @@ -542,7 +542,7 @@ MessageQueue *MctlLadder::makeQueue(StaticANIObject *ani, int xpos, int ypos, in mq = _aniHandler.makeRunQueue(&mkQueue); ex = new ExCommand(ani->_id, 1, _ladmovements[pos]->movVars->varUpStop, 0, 0, 0, 1, 0, 0, 0); - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; ex->_excFlags |= 2; mq->insertExCommandAt(0, ex); @@ -608,7 +608,7 @@ MessageQueue *MctlLadder::makeQueue(StaticANIObject *ani, int xpos, int ypos, in mq = _aniHandler.makeRunQueue(&mkQueue); ex = new ExCommand(ani->_id, 1, _ladmovements[pos]->movVars->varDownStop, 0, 0, 0, 1, 0, 0, 0); - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; ex->_excFlags |= 2; mq->insertExCommandAt(0, ex); @@ -950,13 +950,13 @@ MessageQueue *MovGraph::startMove(StaticANIObject *ani, int xpos, int ypos, int mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); ex = new ExCommand(ani->_id, 21, 0, 0, 0, 0, 1, 0, 0, 0); - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; ex->_field_3C = 1; ex->_field_24 = 0; mq->addExCommandToEnd(ex); ex = new ExCommand(ani->_id, 51, 0, xpos, ypos, 0, 1, 0, 0, 0); - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; ex->_field_3C = 1; ex->_field_24 = 0; ex->_field_20 = fuzzyMatch; @@ -1998,7 +1998,7 @@ MessageQueue *MctlGraph::makeWholeQueue(MctlMQ *mctlMQ) { ExCommand *ex = new ExCommand(_items2[mctlMQ->index]->_objectId, 1, mg2i->_movementId, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = _items2[mctlMQ->index]->_obj->_okeyCode; + ex->_param = _items2[mctlMQ->index]->_obj->_odelay; ex->_field_24 = 1; ex->_field_14 = -1; mq->addExCommandToEnd(ex); @@ -2599,7 +2599,7 @@ MessageQueue *MctlGraph::makeLineQueue(MctlMQ *info) { ex->_field_14 = info->distance1; - ex->_param = _items2[info->index]->_obj->_okeyCode; + ex->_param = _items2[info->index]->_obj->_odelay; ex->_field_24 = 1; ex->_excFlags |= 2; } else { @@ -2617,7 +2617,7 @@ MessageQueue *MctlGraph::makeLineQueue(MctlMQ *info) { ex->_field_14 = info->distance1; - ex->_param = _items2[info->index]->_obj->_okeyCode; + ex->_param = _items2[info->index]->_obj->_odelay; ex->_field_24 = 1; ex->_excFlags |= 2; mq->addExCommandToEnd(ex); @@ -2631,7 +2631,7 @@ MessageQueue *MctlGraph::makeLineQueue(MctlMQ *info) { &y2, -1); ex->_parId = mq->_id; - ex->_param = _items2[info->index]->_obj->_okeyCode; + ex->_param = _items2[info->index]->_obj->_odelay; } mq->addExCommandToEnd(ex); @@ -2653,7 +2653,7 @@ MessageQueue *MctlGraph::makeLineQueue(MctlMQ *info) { &y2, par); ex->_parId = mq->_id; - ex->_param = _items2[info->index]->_obj->_okeyCode; + ex->_param = _items2[info->index]->_obj->_odelay; mq->addExCommandToEnd(ex); } @@ -2667,7 +2667,7 @@ MessageQueue *MctlGraph::makeLineQueue(MctlMQ *info) { &y2, -1); ex->_parId = mq->_id; - ex->_param = _items2[info->index]->_obj->_okeyCode; + ex->_param = _items2[info->index]->_obj->_odelay; mq->addExCommandToEnd(ex); } @@ -2675,7 +2675,7 @@ MessageQueue *MctlGraph::makeLineQueue(MctlMQ *info) { ex = new ExCommand(_items2[info->index]->_objectId, 5, -1, info->pt2.x, info->pt2.y, 0, 1, 0, 0, 0); ex->_field_14 = info->distance2; - ex->_param = _items2[info->index]->_obj->_okeyCode; + ex->_param = _items2[info->index]->_obj->_odelay; ex->_field_24 = 0; ex->_excFlags |= 2; diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp index 6f23431203a1..d8e30905592e 100644 --- a/engines/fullpipe/scene.cpp +++ b/engines/fullpipe/scene.cpp @@ -302,7 +302,7 @@ StaticANIObject *Scene::getAniMan() { StaticANIObject *Scene::getStaticANIObject1ById(int obj, int a3) { for (uint i = 0; i < _staticANIObjectList1.size(); i++) { - if (_staticANIObjectList1[i]->_id == obj && (a3 == -1 || _staticANIObjectList1[i]->_okeyCode == a3)) + if (_staticANIObjectList1[i]->_id == obj && (a3 == -1 || _staticANIObjectList1[i]->_odelay == a3)) return _staticANIObjectList1[i]; } @@ -311,7 +311,7 @@ StaticANIObject *Scene::getStaticANIObject1ById(int obj, int a3) { StaticANIObject *Scene::getStaticANIObject1ByName(char *name, int a3) { for (uint i = 0; i < _staticANIObjectList1.size(); i++) { - if (!strcmp(_staticANIObjectList1[i]->_objectName, name) && (a3 == -1 || _staticANIObjectList1[i]->_okeyCode == a3)) + if (!strcmp(_staticANIObjectList1[i]->_objectName, name) && (a3 == -1 || _staticANIObjectList1[i]->_odelay == a3)) return _staticANIObjectList1[i]; } @@ -333,13 +333,13 @@ void Scene::deleteStaticANIObject(StaticANIObject *obj) { } void Scene::addStaticANIObject(StaticANIObject *obj, bool addList2) { - if (obj->_okeyCode) + if (obj->_odelay) obj->renumPictures(&_staticANIObjectList1); _staticANIObjectList1.push_back(obj); if (addList2) { - if (!obj->_okeyCode) + if (!obj->_odelay) obj->clearFlags(); _staticANIObjectList2.push_back(obj); @@ -359,7 +359,7 @@ void Scene::stopAllSounds() { PictureObject *Scene::getPictureObjectById(int objId, int flags) { for (uint i = 1; i < _picObjList.size(); i++) { - if (((PictureObject *)_picObjList[i])->_id == objId && ((PictureObject *)_picObjList[i])->_okeyCode == flags) + if (((PictureObject *)_picObjList[i])->_id == objId && ((PictureObject *)_picObjList[i])->_odelay == flags) return (PictureObject *)_picObjList[i]; } @@ -368,7 +368,7 @@ PictureObject *Scene::getPictureObjectById(int objId, int flags) { PictureObject *Scene::getPictureObjectByName(const char *objName, int flags) { for (uint i = 0; i < _picObjList.size(); i++) { - if (!strcmp(((PictureObject *)_picObjList[i])->_objectName, objName) && (((PictureObject *)_picObjList[i])->_okeyCode == flags || flags == -1)) + if (!strcmp(((PictureObject *)_picObjList[i])->_objectName, objName) && (((PictureObject *)_picObjList[i])->_odelay == flags || flags == -1)) return (PictureObject *)_picObjList[i]; } diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index dcb737ac1c67..6810744f8af8 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -303,14 +303,14 @@ void sceneHandler04_walkClimbLadder(ExCommand *ex) { ExCommand *ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_TOLADDER, 0, 0, 0, 1, 0, 0, 0); - ex1->_param = g_fp->_aniMan->_okeyCode; + ex1->_param = g_fp->_aniMan->_odelay; ex1->_excFlags |= 2; mq->addExCommandToEnd(ex1); ExCommand *ex2 = new ExCommand(ANI_MAN, 1, MV_MAN_STOPLADDER, 0, 0, 0, 1, 0, 0, 0); - ex2->_param = g_fp->_aniMan->_okeyCode; + ex2->_param = g_fp->_aniMan->_odelay; ex2->_excFlags |= 2; mq->addExCommandToEnd(ex2); @@ -589,29 +589,29 @@ MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) { if (mq) { ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_TURN, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); for (int i = 0; i < 5; i++) { ex = new ExCommand(ANI_KOZAWKA, 1, rMV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); } ex = new ExCommand(ANI_KOZAWKA, 6, 0, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 17, MSG_KOZAWRESTART, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); } @@ -657,29 +657,29 @@ MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) { ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq1->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_TURN, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq1->addExCommandToEnd(ex); for (int i = 0; i < 5; i++) { ex = new ExCommand(ANI_KOZAWKA, 1, rMV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq1->addExCommandToEnd(ex); } ex = new ExCommand(ANI_KOZAWKA, 6, 0, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq1->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 17, MSG_KOZAWRESTART, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq1->addExCommandToEnd(ex); } @@ -711,17 +711,17 @@ MessageQueue *sceneHandler04_kozFly6(StaticANIObject *ani) { ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_RAISEHEAD, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); g_vars->scene04_kozHeadRaised = true; @@ -771,29 +771,29 @@ MessageQueue *sceneHandler04_kozFly7(StaticANIObject *ani, double phase) { ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_TURN, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); for (int i = 0; i < 2; i++) { ex = new ExCommand(ANI_KOZAWKA, 1, rMV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); } ex = new ExCommand(ANI_KOZAWKA, 6, 0, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_KOZAWKA, 17, MSG_KOZAWRESTART, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); } @@ -936,7 +936,7 @@ void sceneHandler04_walkKozyawka() { g_vars->scene04_kozyawkiObjList.pop_front(); MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_KOZAW_WALK), 0, 1); - mq->setParamInt(-1, g_vars->scene04_walkingKozyawka->_okeyCode); + mq->setParamInt(-1, g_vars->scene04_walkingKozyawka->_odelay); mq->chain(0); } } @@ -1116,18 +1116,18 @@ void sceneHandler04_leaveLadder(ExCommand *ex) { if (g_fp->_aniMan->_statics->_staticsId == ST_MAN_LADDERDOWN) { ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_LOOKLADDERRV, 0, 0, 0, 1, 0, 0, 0); - ex1->_param = g_fp->_aniMan->_okeyCode; + ex1->_param = g_fp->_aniMan->_odelay; ex1->_excFlags |= 2; mq->addExCommandToEnd(ex1); } ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_STARTLADDERD, 0, 0, 0, 1, 0, 0, 0); - ex1->_param = g_fp->_aniMan->_okeyCode; + ex1->_param = g_fp->_aniMan->_odelay; ex1->_excFlags |= 2; mq->addExCommandToEnd(ex1); ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_FROMLADDER, 0, 0, 0, 1, 0, 0, 0); - ex1->_param = g_fp->_aniMan->_okeyCode; + ex1->_param = g_fp->_aniMan->_odelay; ex1->_excFlags |= 2; mq->addExCommandToEnd(ex1); diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp index 388c1d1b2ccb..4d1b263fd486 100644 --- a/engines/fullpipe/scenes/scene06.cpp +++ b/engines/fullpipe/scenes/scene06.cpp @@ -266,7 +266,7 @@ void sceneHandler06_showNextBall() { MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC6_SHOWNEXTBALL), 0, 1); - mq->setParamInt(-1, g_vars->scene06_currentBall->_okeyCode); + mq->setParamInt(-1, g_vars->scene06_currentBall->_odelay); mq->chain(0); ++g_vars->scene06_numBallsGiven; @@ -412,7 +412,7 @@ void sceneHandler06_fallBall() { MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC6_FALLBALL), 0, 1); - mq->setParamInt(-1, g_vars->scene06_flyingBall->_okeyCode); + mq->setParamInt(-1, g_vars->scene06_flyingBall->_odelay); mq->chain(0); g_vars->scene06_balls.push_back(g_vars->scene06_flyingBall); diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp index 313bf9d0125a..b9aaabe1afcb 100644 --- a/engines/fullpipe/scenes/scene08.cpp +++ b/engines/fullpipe/scenes/scene08.cpp @@ -318,7 +318,7 @@ void sceneHandler08_badLuck() { ExCommand *ex = new ExCommand(g_fp->_aniMan->_id, 1, MV_MAN8_BADLUCK, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_param = g_fp->_aniMan->_okeyCode; + ex->_param = g_fp->_aniMan->_odelay; mq->addExCommandToEnd(ex); mq->setFlags(mq->getFlags() | 1); diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp index 3086cf0cfcc5..321945498740 100644 --- a/engines/fullpipe/scenes/scene09.cpp +++ b/engines/fullpipe/scenes/scene09.cpp @@ -486,7 +486,7 @@ void sceneHandler09_ballExplode(Ball *ball) { MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC9_BALLEXPLODE), 0, 1); - mq->setParamInt(-1, ball->ani->_okeyCode); + mq->setParamInt(-1, ball->ani->_odelay); if (!mq->chain(ball->ani)) delete mq; diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp index adcc0b79842e..0e072094d7ca 100644 --- a/engines/fullpipe/scenes/scene14.cpp +++ b/engines/fullpipe/scenes/scene14.cpp @@ -143,13 +143,13 @@ void sceneHandler14_showBallGrandmaHit() { MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_TOGMA, 0, 0, 0, 1, 0, 0, 0); - ex->_param = g_vars->scene14_flyingBall->_okeyCode; + ex->_param = g_vars->scene14_flyingBall->_odelay; ex->_excFlags |= 2; ex->_field_24 = 1; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0); - ex->_param = g_vars->scene14_flyingBall->_okeyCode; + ex->_param = g_vars->scene14_flyingBall->_odelay; ex->_excFlags |= 3; mq->addExCommandToEnd(ex); mq->chain(0); @@ -185,13 +185,13 @@ void sceneHandler14_showBallMan() { MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_TOGMA, 0, 0, 0, 1, 0, 0, 0); - ex->_param = g_vars->scene14_flyingBall->_okeyCode; + ex->_param = g_vars->scene14_flyingBall->_odelay; ex->_excFlags |= 2; ex->_field_24 = 1; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0); - ex->_param = g_vars->scene14_flyingBall->_okeyCode; + ex->_param = g_vars->scene14_flyingBall->_odelay; ex->_excFlags |= 3; mq->addExCommandToEnd(ex); mq->chain(0); @@ -501,13 +501,13 @@ void sceneHandler14_passToGrandma() { MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_FALL, 0, 0, 0, 1, 0, 0, 0); - ex->_param = g_vars->scene14_flyingBall->_okeyCode; + ex->_param = g_vars->scene14_flyingBall->_odelay; ex->_excFlags |= 2; ex->_field_24 = 1; mq->addExCommandToEnd(ex); ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0); - ex->_param = g_vars->scene14_flyingBall->_okeyCode; + ex->_param = g_vars->scene14_flyingBall->_odelay; ex->_excFlags |= 3; mq->addExCommandToEnd(ex); mq->chain(0); diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp index cb21f281034e..89b797757b18 100644 --- a/engines/fullpipe/scenes/scene16.cpp +++ b/engines/fullpipe/scenes/scene16.cpp @@ -181,7 +181,7 @@ void sceneHandler16_fillMug() { if (g_vars->scene16_walkingBoy) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1); - mq->setParamInt(-1, g_vars->scene16_walkingBoy->_okeyCode); + mq->setParamInt(-1, g_vars->scene16_walkingBoy->_odelay); if (mq->chain(g_vars->scene16_walkingBoy)) return; } else { @@ -190,7 +190,7 @@ void sceneHandler16_fillMug() { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1); - mq->setParamInt(-1, g_vars->scene16_walkingGirl->_okeyCode); + mq->setParamInt(-1, g_vars->scene16_walkingGirl->_odelay); if (mq->chain(g_vars->scene16_walkingGirl)) return; } @@ -208,7 +208,7 @@ void sceneHandler16_fillMug() { if (g_vars->scene16_walkingBoy) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1); - mq->setParamInt(-1, g_vars->scene16_walkingBoy->_okeyCode); + mq->setParamInt(-1, g_vars->scene16_walkingBoy->_odelay); ani = g_vars->scene16_walkingBoy; } else { @@ -217,7 +217,7 @@ void sceneHandler16_fillMug() { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1); - mq->setParamInt(-1, g_vars->scene16_walkingGirl->_okeyCode); + mq->setParamInt(-1, g_vars->scene16_walkingGirl->_odelay); ani = g_vars->scene16_walkingGirl; } @@ -232,7 +232,7 @@ void sceneHandler16_startLaugh() { MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLLAUGH), 0, 1); - mq->setParamInt(-1, girl->_okeyCode); + mq->setParamInt(-1, girl->_odelay); mq->setFlags(mq->getFlags() | 1); mq->chain(0); @@ -258,7 +258,7 @@ void sceneHandler16_drink() { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYKICK), 0, 1); - mq->setParamInt(-1, g_vars->scene16_walkingBoy->_okeyCode); + mq->setParamInt(-1, g_vars->scene16_walkingBoy->_odelay); ex = new ExCommand(ANI_MAN, 34, 384, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3u; @@ -361,7 +361,7 @@ void sceneHandler16_putOnWheel() { if (ani->_id == ANI_BOY) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GOBOY), 0, 1); - mq->setParamInt(-1, ani->_okeyCode); + mq->setParamInt(-1, ani->_odelay); mq->chain(0); g_vars->scene16_walkingBoy = ani; @@ -370,7 +370,7 @@ void sceneHandler16_putOnWheel() { if (g_fp->getObjectState(sO_Girl) == g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging)) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GOGIRL), 0, 1); - mq->setParamInt(-1, ani->_okeyCode); + mq->setParamInt(-1, ani->_odelay); mq->chain(0); g_vars->scene16_walkingBoy = 0; diff --git a/engines/fullpipe/scenes/scene23.cpp b/engines/fullpipe/scenes/scene23.cpp index 2bb928f007a9..a2d4f01f2bf3 100644 --- a/engines/fullpipe/scenes/scene23.cpp +++ b/engines/fullpipe/scenes/scene23.cpp @@ -351,7 +351,7 @@ void sceneHandler23_pushButton(ExCommand *cmd) { void sceneHandler23_sendClick(StaticANIObject *ani) { int msg = 0; - switch (ani->_okeyCode) { + switch (ani->_odelay) { case 0: msg = MSG_SC23_CLICKBTN1; break; diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp index bb05e2f197c1..dfb767ee918d 100644 --- a/engines/fullpipe/scenes/scene25.cpp +++ b/engines/fullpipe/scenes/scene25.cpp @@ -234,7 +234,7 @@ void sceneHandler25_animateBearders() { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC25_BEARDED), 0, 1); - mq->setParamInt(-1, g_vars->scene25_bearders[0]->_okeyCode); + mq->setParamInt(-1, g_vars->scene25_bearders[0]->_odelay); mq->getExCommandByIndex(0)->_x = g_fp->_rnd->getRandomNumber(650) + 100; mq->chain(0); @@ -243,14 +243,14 @@ void sceneHandler25_animateBearders() { if (g_fp->_rnd->getRandomNumber(32767) < 0x1FFF) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC25_BEARDED2), 0, 1); - mq->setParamInt(-1, g_vars->scene25_bearders[1]->_okeyCode); + mq->setParamInt(-1, g_vars->scene25_bearders[1]->_odelay); mq->getExCommandByIndex(0)->_x = g_fp->_rnd->getRandomNumber(650) + 100; mq->chain(0); if (g_fp->_rnd->getRandomNumber(32767) < 8191) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC25_BEARDED3), 0, 1); - mq->setParamInt(-1, g_vars->scene25_bearders[2]->_okeyCode); + mq->setParamInt(-1, g_vars->scene25_bearders[2]->_odelay); mq->getExCommandByIndex(0)->_x = g_fp->_rnd->getRandomNumber(650) + 100; mq->chain(0); } diff --git a/engines/fullpipe/scenes/scene26.cpp b/engines/fullpipe/scenes/scene26.cpp index df7accc95938..d183ee9da802 100644 --- a/engines/fullpipe/scenes/scene26.cpp +++ b/engines/fullpipe/scenes/scene26.cpp @@ -120,7 +120,7 @@ void sceneHandler26_testVent() { if (!g_vars->scene26_activeVent) return; - if (g_vars->scene26_activeVent->_okeyCode == 0) { + if (g_vars->scene26_activeVent->_odelay == 0) { if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Opened)) g_fp->stopAllSoundInstances(SND_26_018); else @@ -137,7 +137,7 @@ void sceneHandler26_testVent() { g_fp->playSound(SND_26_020, 0); } - } else if (g_vars->scene26_activeVent->_okeyCode == 1) { + } else if (g_vars->scene26_activeVent->_odelay == 1) { if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Opened)) g_fp->playSound(SND_26_020, 0); else @@ -152,7 +152,7 @@ void sceneHandler26_testVent() { chainQueue(QU_SC26_AUTOCLOSE1, 0); } - } else if (g_vars->scene26_activeVent->_okeyCode == 2) { + } else if (g_vars->scene26_activeVent->_odelay == 2) { if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Opened)) g_fp->playSound(SND_26_020, 0); else @@ -195,7 +195,7 @@ void sceneHandler26_hideVent() { void sceneHandler26_animateVents(StaticANIObject *ani) { int qId = 0; - switch (ani->_okeyCode) { + switch (ani->_odelay) { case 0: if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Closed)) qId = QU_SC26_OPEN1; @@ -249,7 +249,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { } void sceneHandler26_clickVent(StaticANIObject *ani, ExCommand *cmd) { - if (ani->_okeyCode || g_fp->getObjectState(sO_Hatch_26) == g_fp->getObjectEnumState(sO_Hatch_26, sO_Opened)) { + if (ani->_odelay || g_fp->getObjectState(sO_Hatch_26) == g_fp->getObjectEnumState(sO_Hatch_26, sO_Opened)) { if (g_fp->_aniMan->isIdle() && !(g_fp->_aniMan->_flags & 0x100)) { g_vars->scene26_activeVent = ani; @@ -263,7 +263,7 @@ void sceneHandler26_clickVent(StaticANIObject *ani, ExCommand *cmd) { ExCommand *ex = new ExCommand(0, 17, MSG_SC26_CLICKVENT, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; - ex->_param = ani->_okeyCode; + ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp index c8a7bae4c76c..93ff53f9960e 100644 --- a/engines/fullpipe/scenes/scene27.cpp +++ b/engines/fullpipe/scenes/scene27.cpp @@ -191,7 +191,7 @@ void sceneHandler27_showNextBat() { if (g_vars->scene27_bat) { MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC27_SHOWBET), 0, 1); - mq->setParamInt(-1, g_vars->scene27_bat->_okeyCode); + mq->setParamInt(-1, g_vars->scene27_bat->_odelay); mq->chain(0); } diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp index f096e6964bd9..d7d2d213ee89 100644 --- a/engines/fullpipe/scenes/scene28.cpp +++ b/engines/fullpipe/scenes/scene28.cpp @@ -405,7 +405,7 @@ int sceneHandler28(ExCommand *cmd) { if (ani) if (ani->_id == ANI_LIFT || ani->_id == ANI_LIFT_28 ) { - sceneHandler28_clickLift(ani->_okeyCode); + sceneHandler28_clickLift(ani->_odelay); cmd->_messageKind = 0; break; diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp index 80f82e09cddb..c29dac0bab98 100644 --- a/engines/fullpipe/scenes/scene29.cpp +++ b/engines/fullpipe/scenes/scene29.cpp @@ -510,7 +510,7 @@ void sceneHandler29_manHit() { if (g_vars->scene29_manX <= 638) { ex = new ExCommand(ANI_MAN, 1, MV_MAN29_STANDUP_NORM, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags = 2; - ex->_param = g_fp->_aniMan->_okeyCode; + ex->_param = g_fp->_aniMan->_odelay; mq->addExCommandToEnd(ex); ex = new ExCommand(0, 17, MSG_SC29_STOPRIDE, 0, 0, 0, 1, 0, 0, 0); @@ -524,7 +524,7 @@ void sceneHandler29_manHit() { } else { ex = new ExCommand(ANI_MAN, 1, MV_MAN29_STANDUP, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags = 2; - ex->_param = g_fp->_aniMan->_okeyCode; + ex->_param = g_fp->_aniMan->_odelay; mq->addExCommandToEnd(ex); } @@ -878,7 +878,7 @@ void sceneHandler29_animBearded() { if (x - g_vars->scene29_manX < 100 || !g_vars->scene29_arcadeIsOn) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC29_BRDOUT1), 0, 1); - mq->setParamInt(-1, ani->_okeyCode); + mq->setParamInt(-1, ani->_odelay); mq->chain(0); g_vars->scene29_bearders[i]->wbflag = 0; @@ -898,7 +898,7 @@ void sceneHandler29_animBearded() { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC29_BRDOUT2), 0, 1); - mq->setParamInt(-1, ani->_okeyCode); + mq->setParamInt(-1, ani->_odelay); mq->chain(0); g_vars->scene29_bearders[i]->wbflag = 0; @@ -939,7 +939,7 @@ void sceneHandler29_animBearded() { } mq->getExCommandByIndex(0)->_x = newx; - mq->setParamInt(-1, ani->_okeyCode); + mq->setParamInt(-1, ani->_odelay); mq->chain(0); g_vars->scene29_bearders[i]->wbflag = 1; diff --git a/engines/fullpipe/scenes/scene32.cpp b/engines/fullpipe/scenes/scene32.cpp index 1766d790b8fa..e1c999d75492 100644 --- a/engines/fullpipe/scenes/scene32.cpp +++ b/engines/fullpipe/scenes/scene32.cpp @@ -185,7 +185,7 @@ void sceneHandler32_trySit(ExCommand *cmd) { ex->_parentId = ANI_MAN; ex->_messageKind = 1; ex->_messageNum = MV_MAN32_SITDOWN; - ex->_param = g_fp->_aniMan->_okeyCode; + ex->_param = g_fp->_aniMan->_odelay; g_vars->scene32_dudeIsSitting = true; diff --git a/engines/fullpipe/scenes/scene33.cpp b/engines/fullpipe/scenes/scene33.cpp index f9fdcdf9cc7a..6a58cdf6944e 100644 --- a/engines/fullpipe/scenes/scene33.cpp +++ b/engines/fullpipe/scenes/scene33.cpp @@ -107,7 +107,7 @@ void sceneHandler33_switchVent(StaticANIObject *ani) { if (mv) ani->startAnim(mv, 0, -1); - g_vars->scene33_ventsState[ani->_okeyCode] = !g_vars->scene33_ventsState[ani->_okeyCode]; + g_vars->scene33_ventsState[ani->_odelay] = !g_vars->scene33_ventsState[ani->_odelay]; } void sceneHandler33_processVents() { @@ -169,7 +169,7 @@ void sceneHandler33_zoneClickProcess(StaticANIObject *ani) { StaticANIObject *vent1 = 0; StaticANIObject *vent2 = 0; - switch (ani->_okeyCode) { + switch (ani->_odelay) { case 0: vent1 = g_fp->_currentScene->getStaticANIObject1ById(ANI_VENT_33, 2); vent2 = g_fp->_currentScene->getStaticANIObject1ById(ANI_VENT_33, 3); diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 39bd2965d0ae..25ab6cd6c703 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -824,7 +824,7 @@ void StaticANIObject::update(int counterdiff) { newex->_excFlags |= 2; if (newex->_messageKind == 17) { newex->_parentId = _id; - newex->_param = _okeyCode; + newex->_param = _odelay; } newex->sendMessage(); @@ -836,7 +836,7 @@ void StaticANIObject::update(int counterdiff) { if (dyn->_initialCountdown == dyn->_countdown && dyn->_field_68 != 0) { newex = new ExCommand(_id, 17, dyn->_field_68, 0, 0, 0, 1, 0, 0, 0); newex->_excFlags = 2; - newex->_param = _okeyCode; + newex->_param = _odelay; newex->sendMessage(); if (!_movement) @@ -1006,7 +1006,7 @@ void StaticANIObject::stopAnim_maybe() { _movement = 0; ExCommand *ex = new ExCommand(_id, 17, 24, 0, 0, 0, 1, 0, 0, 0); - ex->_param = _okeyCode; + ex->_param = _odelay; ex->_excFlags = 2; ex->postMessage(); } @@ -1274,7 +1274,7 @@ void StaticANIObject::startAnimSteps(int movementId, int messageQueueId, int x, ExCommand *ex = new ExCommand(_id, 17, 23, 0, 0, movementId, 1, 0, 0, 0); - ex->_param = _okeyCode; + ex->_param = _odelay; ex->_excFlags = 2; ex->postMessage(); } @@ -1386,7 +1386,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase ExCommand *newex = new ExCommand(_id, 17, 23, 0, 0, movementId, 1, 0, 0, 0); - newex->_param = _okeyCode; + newex->_param = _odelay; newex->_excFlags = 2; newex->postMessage();