thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FULLPIPE: Field renames

Browse source
This commit is contained in:
Eugene Sandulenko 2020-09-15 11:27:52 +02:00
parent d36bb15d07
commit 7c4499d28a
6 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/fullpipe/interaction.cpp
View file

@ -189,7 +189,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
ex->_param = subj ? subj->_odelay : 0; ex->_param = subj ? subj->_odelay : 0;
ex->_excFlags = 3; ex->_excFlags = 3;
ex->_z = (obj->_objtype != kObjTypePictureObject); ex->_z = (obj->_objtype != kObjTypePictureObject);
ex->_field_20 = invId; ex->_invId = invId;
mq->addExCommandToEnd(ex); mq->addExCommandToEnd(ex);
if (mq->_isFinished) { if (mq->_isFinished) {
@ -324,7 +324,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
ex->_y = obj->_odelay; ex->_y = obj->_odelay;
ex->_param = subj->_odelay; ex->_param = subj->_odelay;
ex->_excFlags = 3; ex->_excFlags = 3;
ex->_field_20 = invId; ex->_invId = invId;
ex->_z = (obj->_objtype != kObjTypePictureObject); ex->_z = (obj->_objtype != kObjTypePictureObject);
mq->addExCommandToEnd(ex); mq->addExCommandToEnd(ex);
@ -336,7 +336,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
ex->_excFlags |= 3; ex->_excFlags |= 3;
ex->_param = 6; ex->_param = 6;
ex->_z = obj->_id; ex->_z = obj->_id;
ex->_field_20 = obj->_odelay; ex->_invId = obj->_odelay;
ex->postMessage(); ex->postMessage();
} }
@ -384,7 +384,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
ex->_param = subj->_odelay; ex->_param = subj->_odelay;
ex->_excFlags = 2; ex->_excFlags = 2;
ex->_z = (obj->_objtype != kObjTypePictureObject); ex->_z = (obj->_objtype != kObjTypePictureObject);
ex->_field_20 = invId; ex->_invId = invId;
mq->addExCommandToEnd(ex); mq->addExCommandToEnd(ex);
if (!mq->_isFinished) if (!mq->_isFinished)

4
engines/fullpipe/inventory.cpp
View file

@ -362,7 +362,7 @@ void Inventory2::slideIn() {
ex->_field_2C = 10; ex->_field_2C = 10;
ex->_z = _isInventoryOut; ex->_z = _isInventoryOut;
ex->_field_20 = !_isInventoryOut; ex->_invId = !_isInventoryOut;
ex->_excFlags |= 3; ex->_excFlags |= 3;
ex->postMessage(); ex->postMessage();
} }
@ -374,7 +374,7 @@ void Inventory2::slideOut() {
ex->_field_2C = 10; ex->_field_2C = 10;
ex->_z = _isInventoryOut; ex->_z = _isInventoryOut;
ex->_field_20 = !_isInventoryOut; ex->_invId = !_isInventoryOut;
ex->_excFlags |= 3; ex->_excFlags |= 3;
ex->postMessage(); ex->postMessage();
} }

14
engines/fullpipe/messagehandlers.cpp
View file

@ -379,7 +379,7 @@ int global_messageHandler3(ExCommand *cmd) {
return g_fp->_gameLoader->gotoScene(cmd->_parentId, cmd->_param); return g_fp->_gameLoader->gotoScene(cmd->_parentId, cmd->_param);
case 64: case 64:
if (g_fp->_currentScene && g_fp->_msgObjectId2 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); ani = g_fp->_currentScene->getStaticANIObject1ById(g_fp->_msgObjectId2, g_fp->_msgId);
if (ani) { if (ani) {
ani->_flags &= 0xFF7F; ani->_flags &= 0xFF7F;
@ -397,7 +397,7 @@ int global_messageHandler3(ExCommand *cmd) {
} }
if (cmd->_param & 4) { if (cmd->_param & 4) {
g_fp->_msgObjectId2 = cmd->_z; g_fp->_msgObjectId2 = cmd->_z;
g_fp->_msgId = cmd->_field_20; g_fp->_msgId = cmd->_invId;
} }
return result; return result;
case 29: case 29:
@ -478,7 +478,7 @@ int global_messageHandler3(ExCommand *cmd) {
return result; return result;
case 57: case 57:
if (cmd->_field_2C) { 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()->removeItem2(g_fp->_currentScene, cmd->_parentId, cmd->_x, cmd->_y, cmd->_z);
getGameLoaderInventory()->rebuildItemRects(); getGameLoaderInventory()->rebuildItemRects();
return 1; return 1;
@ -501,14 +501,14 @@ int global_messageHandler3(ExCommand *cmd) {
obj = g_fp->_currentScene->getStaticANIObject1ById(cmd->_x, cmd->_y); obj = g_fp->_currentScene->getStaticANIObject1ById(cmd->_x, cmd->_y);
else else
obj = g_fp->_currentScene->getPictureObjectById(cmd->_x, cmd->_y); 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; result = 1;
} }
return result; return result;
case 51: 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: case 52:
return doSomeAnimation(cmd->_parentId, cmd->_param, cmd->_field_20); return doSomeAnimation(cmd->_parentId, cmd->_param, cmd->_invId);
case 53: case 53:
return doSomeAnimation2(cmd->_parentId, cmd->_param); return doSomeAnimation2(cmd->_parentId, cmd->_param);
case 63: case 63:
@ -666,7 +666,7 @@ int global_messageHandler4(ExCommand *cmd) {
case 27: case 27:
if (!g_fp->_currentScene || g_fp->_currentScene->getStaticANIObject1ById(cmd->_parentId, cmd->_param) == 0) { 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) { if (ani) {
ani = new StaticANIObject(ani); ani = new StaticANIObject(ani);
g_fp->_currentScene->addStaticANIObject(ani, 1); g_fp->_currentScene->addStaticANIObject(ani, 1);

10
engines/fullpipe/messages.cpp
View file

@ -89,7 +89,7 @@ bool ExCommand::load(MfcArchive &file) {
_z = file.readUint32LE(); _z = file.readUint32LE();
_sceneClickX = file.readUint32LE(); _sceneClickX = file.readUint32LE();
_sceneClickY = file.readUint32LE(); _sceneClickY = file.readUint32LE();
_field_20 = file.readUint32LE(); _invId = file.readUint32LE();
_field_24 = file.readUint32LE(); _field_24 = file.readUint32LE();
_param = file.readUint32LE(); _param = file.readUint32LE();
_field_2C = file.readUint32LE(); _field_2C = file.readUint32LE();
@ -108,7 +108,7 @@ bool ExCommand::load(MfcArchive &file) {
_objtype = kObjTypeExCommand; _objtype = kObjTypeExCommand;
debugC(6, kDebugXML, "%% <COMMAND parent=%d cmd=%s x=%d y=%d f14=%d sceneX=%d sceneY=%d f20=%d f24=%d param=%d f2c=%d f30=%d f34=%d num=%d flags=%d parId=%d />", debugC(6, kDebugXML, "%% <COMMAND parent=%d cmd=%s x=%d y=%d f14=%d sceneX=%d sceneY=%d f20=%d f24=%d param=%d f2c=%d f30=%d f34=%d num=%d flags=%d parId=%d />",
_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); _field_30, _field_34, _messageNum, _excFlags, _parId);
return true; return true;
@ -193,7 +193,7 @@ Message::Message() {
_z = 0; _z = 0;
_sceneClickX = 0; _sceneClickX = 0;
_sceneClickY = 0; _sceneClickY = 0;
_field_20 = 0; _invId = 0;
_field_24 = 0; _field_24 = 0;
_param = 0; _param = 0;
_field_2C = 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; _sceneClickX = sceneClickX;
_sceneClickY = sceneClickY; _sceneClickY = sceneClickY;
_field_24 = a7; _field_24 = a7;
_field_20 = a10; _invId = a10;
_param = 0; _param = 0;
_field_2C = 0; _field_2C = 0;
_field_30 = 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->_excFlags |= 3;
ex->_x = x; ex->_x = x;
ex->_y = y; ex->_y = y;
ex->_field_20 = f20; ex->_invId = f20;
ex->_z = f14; ex->_z = f14;
ex->postMessage(); ex->postMessage();

2
engines/fullpipe/messages.h
View file

@ -44,7 +44,7 @@ class Message : public CObject {
int _z; int _z;
int _sceneClickX; int _sceneClickX;
int _sceneClickY; int _sceneClickY;
int _field_20; int _invId;
int _field_24; int _field_24;
int _param; int _param;
int _field_2C; int _field_2C;

6
engines/fullpipe/motion.cpp
View file

@ -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); ExCommand *ex = new ExCommand(ani->_id, 51, 0, sourceX, sourceY, 0, 1, 0, 0, 0);
ex->_excFlags |= 2; ex->_excFlags |= 2;
ex->_field_20 = fuzzyMatch; ex->_invId = fuzzyMatch;
ex->_param = ani->_odelay; ex->_param = ani->_odelay;
mq->addExCommandToEnd(ex); 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 = 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->_param = subj->_odelay;
ex->_excFlags |= 2; ex->_excFlags |= 2;
@ -957,7 +957,7 @@ MessageQueue *MovGraph::startMove(StaticANIObject *ani, int xpos, int ypos, int
ex->_param = ani->_odelay; ex->_param = ani->_odelay;
ex->_field_3C = 1; ex->_field_3C = 1;
ex->_field_24 = 0; ex->_field_24 = 0;
ex->_field_20 = fuzzyMatch; ex->_invId = fuzzyMatch;
mq->addExCommandToEnd(ex); mq->addExCommandToEnd(ex);
if (mq->chain(0)) if (mq->chain(0))