From 7c4499d28a371e56f449b4d692b10ca340bdd1f0 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 15 Sep 2020 11:27:52 +0200 Subject: [PATCH] FULLPIPE: Field renames --- engines/fullpipe/interaction.cpp | 8 ++++---- engines/fullpipe/inventory.cpp | 4 ++-- engines/fullpipe/messagehandlers.cpp | 14 +++++++------- engines/fullpipe/messages.cpp | 10 +++++----- engines/fullpipe/messages.h | 2 +- engines/fullpipe/motion.cpp | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index 686e4b1da7d..6f78a5b5cc7 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -189,7 +189,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject ex->_param = subj ? subj->_odelay : 0; ex->_excFlags = 3; ex->_z = (obj->_objtype != kObjTypePictureObject); - ex->_field_20 = invId; + ex->_invId = invId; mq->addExCommandToEnd(ex); if (mq->_isFinished) { @@ -324,7 +324,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject ex->_y = obj->_odelay; ex->_param = subj->_odelay; ex->_excFlags = 3; - ex->_field_20 = invId; + ex->_invId = invId; ex->_z = (obj->_objtype != kObjTypePictureObject); mq->addExCommandToEnd(ex); @@ -336,7 +336,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject ex->_excFlags |= 3; ex->_param = 6; ex->_z = obj->_id; - ex->_field_20 = obj->_odelay; + ex->_invId = obj->_odelay; ex->postMessage(); } @@ -384,7 +384,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject ex->_param = subj->_odelay; ex->_excFlags = 2; ex->_z = (obj->_objtype != kObjTypePictureObject); - ex->_field_20 = invId; + ex->_invId = invId; mq->addExCommandToEnd(ex); if (!mq->_isFinished) diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp index e05c9d1fe88..1e696115f41 100644 --- a/engines/fullpipe/inventory.cpp +++ b/engines/fullpipe/inventory.cpp @@ -362,7 +362,7 @@ void Inventory2::slideIn() { ex->_field_2C = 10; ex->_z = _isInventoryOut; - ex->_field_20 = !_isInventoryOut; + ex->_invId = !_isInventoryOut; ex->_excFlags |= 3; ex->postMessage(); } @@ -374,7 +374,7 @@ void Inventory2::slideOut() { ex->_field_2C = 10; ex->_z = _isInventoryOut; - ex->_field_20 = !_isInventoryOut; + ex->_invId = !_isInventoryOut; ex->_excFlags |= 3; ex->postMessage(); } diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp index 5b440e3be35..bf6c271d42e 100644 --- a/engines/fullpipe/messagehandlers.cpp +++ b/engines/fullpipe/messagehandlers.cpp @@ -379,7 +379,7 @@ int global_messageHandler3(ExCommand *cmd) { return g_fp->_gameLoader->gotoScene(cmd->_parentId, cmd->_param); case 64: if (g_fp->_currentScene && g_fp->_msgObjectId2 - && (!(cmd->_param & 4) || g_fp->_msgObjectId2 != cmd->_z || g_fp->_msgId != cmd->_field_20)) { + && (!(cmd->_param & 4) || g_fp->_msgObjectId2 != cmd->_z || g_fp->_msgId != cmd->_invId)) { ani = g_fp->_currentScene->getStaticANIObject1ById(g_fp->_msgObjectId2, g_fp->_msgId); if (ani) { ani->_flags &= 0xFF7F; @@ -397,7 +397,7 @@ int global_messageHandler3(ExCommand *cmd) { } if (cmd->_param & 4) { g_fp->_msgObjectId2 = cmd->_z; - g_fp->_msgId = cmd->_field_20; + g_fp->_msgId = cmd->_invId; } return result; case 29: @@ -478,7 +478,7 @@ int global_messageHandler3(ExCommand *cmd) { return result; case 57: if (cmd->_field_2C) { - if (!cmd->_field_20) { + if (!cmd->_invId) { getGameLoaderInventory()->removeItem2(g_fp->_currentScene, cmd->_parentId, cmd->_x, cmd->_y, cmd->_z); getGameLoaderInventory()->rebuildItemRects(); return 1; @@ -501,14 +501,14 @@ int global_messageHandler3(ExCommand *cmd) { obj = g_fp->_currentScene->getStaticANIObject1ById(cmd->_x, cmd->_y); else obj = g_fp->_currentScene->getPictureObjectById(cmd->_x, cmd->_y); - handleObjectInteraction(g_fp->_currentScene->getStaticANIObject1ById(cmd->_parentId, cmd->_param), obj, cmd->_field_20); + handleObjectInteraction(g_fp->_currentScene->getStaticANIObject1ById(cmd->_parentId, cmd->_param), obj, cmd->_invId); result = 1; } return result; case 51: - return startWalkTo(cmd->_parentId, cmd->_param, cmd->_x, cmd->_y, cmd->_field_20); + return startWalkTo(cmd->_parentId, cmd->_param, cmd->_x, cmd->_y, cmd->_invId); case 52: - return doSomeAnimation(cmd->_parentId, cmd->_param, cmd->_field_20); + return doSomeAnimation(cmd->_parentId, cmd->_param, cmd->_invId); case 53: return doSomeAnimation2(cmd->_parentId, cmd->_param); case 63: @@ -666,7 +666,7 @@ int global_messageHandler4(ExCommand *cmd) { case 27: if (!g_fp->_currentScene || g_fp->_currentScene->getStaticANIObject1ById(cmd->_parentId, cmd->_param) == 0) { - ani = g_fp->accessScene(cmd->_field_20)->getStaticANIObject1ById(cmd->_parentId, -1); + ani = g_fp->accessScene(cmd->_invId)->getStaticANIObject1ById(cmd->_parentId, -1); if (ani) { ani = new StaticANIObject(ani); g_fp->_currentScene->addStaticANIObject(ani, 1); diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp index 0272e82f58a..81934ea1df6 100644 --- a/engines/fullpipe/messages.cpp +++ b/engines/fullpipe/messages.cpp @@ -89,7 +89,7 @@ bool ExCommand::load(MfcArchive &file) { _z = file.readUint32LE(); _sceneClickX = file.readUint32LE(); _sceneClickY = file.readUint32LE(); - _field_20 = file.readUint32LE(); + _invId = file.readUint32LE(); _field_24 = file.readUint32LE(); _param = file.readUint32LE(); _field_2C = file.readUint32LE(); @@ -108,7 +108,7 @@ bool ExCommand::load(MfcArchive &file) { _objtype = kObjTypeExCommand; debugC(6, kDebugXML, "%% ", - _parentId, exCommandType2str(_messageKind), _x, _y, _z, _sceneClickX, _sceneClickY, _field_20, _field_24, _param, _field_2C, + _parentId, exCommandType2str(_messageKind), _x, _y, _z, _sceneClickX, _sceneClickY, _invId, _field_24, _param, _field_2C, _field_30, _field_34, _messageNum, _excFlags, _parId); return true; @@ -193,7 +193,7 @@ Message::Message() { _z = 0; _sceneClickX = 0; _sceneClickY = 0; - _field_20 = 0; + _invId = 0; _field_24 = 0; _param = 0; _field_2C = 0; @@ -210,7 +210,7 @@ Message::Message(int16 parentId, int messageKind, int x, int y, int z, int a7, i _sceneClickX = sceneClickX; _sceneClickY = sceneClickY; _field_24 = a7; - _field_20 = a10; + _invId = a10; _param = 0; _field_2C = 0; _field_30 = 0; @@ -957,7 +957,7 @@ void postExCommand(int parentId, int keyCode, int x, int y, int f20, int f14) { ex->_excFlags |= 3; ex->_x = x; ex->_y = y; - ex->_field_20 = f20; + ex->_invId = f20; ex->_z = f14; ex->postMessage(); diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h index def8d10a748..03f07d87c59 100644 --- a/engines/fullpipe/messages.h +++ b/engines/fullpipe/messages.h @@ -44,7 +44,7 @@ class Message : public CObject { int _z; int _sceneClickX; int _sceneClickY; - int _field_20; + int _invId; int _field_24; int _param; int _field_2C; diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 70a1e2c5e6d..83407420faf 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -249,7 +249,7 @@ MessageQueue *MctlCompound::startMove(StaticANIObject *ani, int sourceX, int sou ExCommand *ex = new ExCommand(ani->_id, 51, 0, sourceX, sourceY, 0, 1, 0, 0, 0); ex->_excFlags |= 2; - ex->_field_20 = fuzzyMatch; + ex->_invId = fuzzyMatch; ex->_param = ani->_odelay; mq->addExCommandToEnd(ex); @@ -317,7 +317,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->_invId = fuzzyMatch; ex->_param = subj->_odelay; ex->_excFlags |= 2; @@ -957,7 +957,7 @@ MessageQueue *MovGraph::startMove(StaticANIObject *ani, int xpos, int ypos, int ex->_param = ani->_odelay; ex->_field_3C = 1; ex->_field_24 = 0; - ex->_field_20 = fuzzyMatch; + ex->_invId = fuzzyMatch; mq->addExCommandToEnd(ex); if (mq->chain(0))