Skip to content

Commit

Permalink
FULLPIPE: Renames in PreloadItem
Browse files Browse the repository at this point in the history
  • Loading branch information
@sev-
sev- committed Sep 4, 2016
1 parent 9b21c5d commit 7e07e01
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 38 deletions.
10 changes: 5 additions & 5 deletions engines/fullpipe/gameloader.cpp
View file
Expand Up @@ -307,7 +307,7 @@ bool preloadCallback(PreloadItem &pre, int flag) {
g_fp->_scene3 = 0;
}
} else {
scene19_setMovements(g_fp->accessScene(pre.preloadId1), pre.keyCode);
scene19_setMovements(g_fp->accessScene(pre.preloadId1), pre.param);

g_vars->scene18_inScene18p1 = true;

Expand All @@ -318,9 +318,9 @@ bool preloadCallback(PreloadItem &pre, int flag) {
}
}

if (((pre.sceneId == SC_19 && pre.keyCode == TrubaRight) || (pre.sceneId == SC_18 && pre.keyCode == TrubaRight)) && !pre.preloadId2) {
if (((pre.sceneId == SC_19 && pre.param == TrubaRight) || (pre.sceneId == SC_18 && pre.param == TrubaRight)) && !pre.preloadId2) {
pre.sceneId = SC_18;
pre.keyCode = TrubaLeft;
pre.param = TrubaLeft;
}

if (!g_fp->_loaderScene) {
Expand Down Expand Up @@ -398,7 +398,7 @@ bool GameLoader::preloadScene(int sceneId, int entranceId) {

ExCommand *ex = new ExCommand(_preloadItems[idx]->sceneId, 17, 62, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags = 2;
ex->_param = _preloadItems[idx]->keyCode;
ex->_param = _preloadItems[idx]->param;

_preloadSceneId = 0;
_preloadEntranceId = 0;
Expand Down Expand Up @@ -690,7 +690,7 @@ bool PreloadItems::load(MfcArchive &file) {
t->preloadId1 = file.readUint32LE();
t->preloadId2 = file.readUint32LE();
t->sceneId = file.readUint32LE();
t->keyCode = file.readSint32LE();
t->param = file.readSint32LE();

push_back(t);
}
Expand Down
2 changes: 1 addition & 1 deletion engines/fullpipe/gameloader.h
View file
Expand Up @@ -64,7 +64,7 @@ struct PreloadItem {
int preloadId1;
int preloadId2;
int sceneId;
int keyCode;
int param;
};

bool preloadCallback(PreloadItem &pre, int flag);
Expand Down
2 changes: 1 addition & 1 deletion engines/fullpipe/lift.cpp
View file
Expand Up @@ -408,7 +408,7 @@ void FullpipeEngine::lift_goAnimation() {
if (pre->preloadId2 == buttonId && pre->preloadId1 == _currentScene->_sceneId) {
MessageQueue *mq = new MessageQueue(_globalMessageQueueList->compact());

ExCommand *ex = new ExCommand(ANI_MAN, 1, (pre->keyCode != LiftDown ? MV_MAN_LIFTDOWN : MV_MAN_LIFTUP), 0, 0, 0, 1, 0, 0, 0);
ExCommand *ex = new ExCommand(ANI_MAN, 1, (pre->param != LiftDown ? MV_MAN_LIFTDOWN : MV_MAN_LIFTUP), 0, 0, 0, 1, 0, 0, 0);

ex->_param = -1;
ex->_field_24 = 1;
Expand Down
62 changes: 31 additions & 31 deletions engines/fullpipe/scenes.cpp
View file
Expand Up @@ -1124,17 +1124,17 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_1:
updateMapPiece(PIC_MAP_S01, 1);

if (pre->keyCode == TrubaUp)
if (pre->param == TrubaUp)
updateMapPiece(PIC_MAP_P01, 1);

if (pre->keyCode == TrubaLeft)
if (pre->param == TrubaLeft)
updateMapPiece(PIC_MAP_A13, 1);
break;

case SC_2:
updateMapPiece(PIC_MAP_S02, 1);

if (pre->keyCode == TrubaLeft)
if (pre->param == TrubaLeft)
updateMapPiece(PIC_MAP_P01, 1);

break;
Expand All @@ -1146,19 +1146,19 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_4:
updateMapPiece(PIC_MAP_S04, 1);

if (pre->keyCode == TrubaRight)
if (pre->param == TrubaRight)
updateMapPiece(PIC_MAP_P04, 1);

break;

case SC_5:
updateMapPiece(PIC_MAP_S05, 1);

if (pre->keyCode == TrubaLeft) {
if (pre->param == TrubaLeft) {
updateMapPiece(PIC_MAP_P04, 1);
}

if (pre->keyCode == TrubaUp) {
if (pre->param == TrubaUp) {
updateMapPiece(PIC_MAP_P05, 1);
updateMapPiece(PIC_MAP_A11, 1);
}
Expand All @@ -1168,50 +1168,50 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_6:
updateMapPiece(PIC_MAP_S06, 1);

if (pre->keyCode == TrubaUp)
if (pre->param == TrubaUp)
updateMapPiece(PIC_MAP_A12, 1);

break;

case SC_7:
updateMapPiece(PIC_MAP_S07, 1);

if (pre->keyCode == TrubaLeft)
if (pre->param == TrubaLeft)
updateMapPiece(PIC_MAP_P18, 1);

break;

case SC_8:
updateMapPiece(PIC_MAP_S08, 1);

if (pre->keyCode == TrubaUp)
if (pre->param == TrubaUp)
updateMapPiece(PIC_MAP_P11, 1);

if (pre->keyCode == TrubaRight)
if (pre->param == TrubaRight)
updateMapPiece(PIC_MAP_P18, 1);

return;

case SC_9:
updateMapPiece(PIC_MAP_S09, 1);

if (pre->keyCode == TrubaDown)
if (pre->param == TrubaDown)
updateMapPiece(PIC_MAP_P11, 1);

return;

case SC_10:
updateMapPiece(PIC_MAP_S10, 1);

if (pre->keyCode == TrubaRight)
if (pre->param == TrubaRight)
updateMapPiece(PIC_MAP_P02, 1);

break;

case SC_11:
updateMapPiece(PIC_MAP_S11, 1);

if (pre->keyCode == TrubaLeft)
if (pre->param == TrubaLeft)
updateMapPiece(PIC_MAP_P02, 1);

break;
Expand All @@ -1223,7 +1223,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_13:
updateMapPiece(PIC_MAP_S13, 1);

if (pre->keyCode == TrubaUp) {
if (pre->param == TrubaUp) {
updateMapPiece(PIC_MAP_P06, 1);
updateMapPiece(PIC_MAP_A10, 1);
}
Expand All @@ -1236,7 +1236,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_15:
updateMapPiece(PIC_MAP_S15, 1);

if (pre->keyCode == TrubaUp) {
if (pre->param == TrubaUp) {
updateMapPiece(PIC_MAP_P08, 1);
updateMapPiece(PIC_MAP_A14, 1);
}
Expand All @@ -1254,15 +1254,15 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_18:
updateMapPiece(PIC_MAP_S1819, 1);

if (pre->keyCode == PIC_SC18_RTRUBA)
if (pre->param == PIC_SC18_RTRUBA)
updateMapPiece(PIC_MAP_P14, 1);

break;

case SC_19:
updateMapPiece(PIC_MAP_S1819, 1);

if (pre->keyCode == PIC_SC19_RTRUBA3) {
if (pre->param == PIC_SC19_RTRUBA3) {
updateMapPiece(PIC_MAP_P15, 1);
updateMapPiece(PIC_MAP_A09, 1);
}
Expand All @@ -1276,12 +1276,12 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_21:
updateMapPiece(PIC_MAP_S21, 1);

if (pre->keyCode == TrubaLeft) {
if (pre->param == TrubaLeft) {
updateMapPiece(PIC_MAP_P15, 1);
updateMapPiece(PIC_MAP_A09, 1);
}

if (pre->keyCode == TrubaDown)
if (pre->param == TrubaDown)
updateMapPiece(PIC_MAP_A08, 1);

break;
Expand All @@ -1304,10 +1304,10 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_24:
updateMapPiece(PIC_MAP_S24, 1);

if (pre->keyCode == TrubaUp)
if (pre->param == TrubaUp)
updateMapPiece(PIC_MAP_A08, 1);

if (pre->keyCode == TrubaDown) {
if (pre->param == TrubaDown) {
updateMapPiece(PIC_MAP_P13, 1);
updateMapPiece(PIC_MAP_A07, 1);
}
Expand All @@ -1320,10 +1320,10 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_26:
updateMapPiece(PIC_MAP_S26, 1);

if (pre->keyCode == TrubaLeft)
if (pre->param == TrubaLeft)
updateMapPiece(PIC_MAP_A06, 1);

if (pre->keyCode == TrubaUp) {
if (pre->param == TrubaUp) {
updateMapPiece(PIC_MAP_P13, 1);
updateMapPiece(PIC_MAP_A07, 1);
}
Expand All @@ -1337,26 +1337,26 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_28:
updateMapPiece(PIC_MAP_S28, 1);

if (pre->keyCode == TrubaRight)
if (pre->param == TrubaRight)
updateMapPiece(PIC_MAP_A06, 1);

break;

case SC_29:
updateMapPiece(PIC_MAP_S29, 1);

if (pre->keyCode == TrubaUp)
if (pre->param == TrubaUp)
updateMapPiece(PIC_MAP_A05, 1);

break;

case SC_30:
updateMapPiece(PIC_MAP_S30, 1);

if (pre->keyCode == TrubaLeft)
if (pre->param == TrubaLeft)
updateMapPiece(PIC_MAP_P09, 1);

if (pre->keyCode == TrubaRight)
if (pre->param == TrubaRight)
updateMapPiece(PIC_MAP_A04, 1);

break;
Expand All @@ -1367,7 +1367,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
if (getObjectState(sO_Cactus) == getObjectEnumState(sO_Cactus, sO_HasGrown))
updateMapPiece(PIC_MAP_S31_1, 1);

if (pre->keyCode == TrubaRight)
if (pre->param == TrubaRight)
updateMapPiece(PIC_MAP_P09, 1);

break;
Expand All @@ -1387,18 +1387,18 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_34:
updateMapPiece(PIC_MAP_S34, 1);

if (pre->keyCode == TrubaUp)
if (pre->param == TrubaUp)
updateMapPiece(PIC_MAP_A03, 1);

break;

case SC_35:
updateMapPiece(PIC_MAP_S35, 1);

if (pre->keyCode == TrubaLeft)
if (pre->param == TrubaLeft)
updateMapPiece(PIC_MAP_A02, 1);

if (pre->keyCode == TrubaDown)
if (pre->param == TrubaDown)
updateMapPiece(PIC_MAP_A03, 1);

break;
Expand Down

0 comments on commit 7e07e01

Please sign in to comment.