diff options
34 files changed, 116 insertions, 118 deletions
diff --git a/engines/fullpipe/anihandler.cpp b/engines/fullpipe/anihandler.cpp index 126abbf247..75e31ef57a 100644 --- a/engines/fullpipe/anihandler.cpp +++ b/engines/fullpipe/anihandler.cpp @@ -69,7 +69,7 @@ MessageQueue *AniHandler::makeQueue(StaticANIObject *ani, int staticsIndex, int if (!_items[idx]->subItems[subidx]->movement) return 0; - MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); + MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); Common::Point point; ExCommand *ex; diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp index d03ac0f405..ee9a7cd9a3 100644 --- a/engines/fullpipe/gameloader.cpp +++ b/engines/fullpipe/gameloader.cpp @@ -429,7 +429,7 @@ bool GameLoader::unloadScene(int sceneId) { _sc2array[sceneTag]._isLoaded = 0; _sc2array[sceneTag]._scene = 0; - return true; + return true; } int GameLoader::getSceneTagBySceneId(int sceneId, SceneTag **st) { diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp index b681f4fbe7..55735624c6 100644 --- a/engines/fullpipe/input.cpp +++ b/engines/fullpipe/input.cpp @@ -175,20 +175,20 @@ void FullpipeEngine::defHandleKeyDown(int key) { if (!input_cheats[_currentCheat][_currentCheatPos]) { switch (_currentCheat) { - case 0: // HELP + case 0: // HELP winArcade(); break; - case 1: // STUFF + case 1: // STUFF getAllInventory(); break; - case 2: // FASTER + case 2: // FASTER _normalSpeed = !_normalSpeed; break; - case 3: // OHWAIT + case 3: // OHWAIT _gamePaused = 1; _flgGameIsRunning = 0; break; - case 4: // MUSOFF + case 4: // MUSOFF if (_musicAllowed & 2) setMusicAllowed(_musicAllowed & 0xFFFFFFFD); else diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index dc40750fe6..641d6e129e 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -433,7 +433,7 @@ Interaction::~Interaction() { if (_messageQueue) { while (_messageQueue->getExCommandByIndex(0)) _messageQueue->deleteExCommandByIndex(0, 1); - } + } delete _messageQueue; diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp index f1dafeba7d..b207ab1657 100644 --- a/engines/fullpipe/inventory.cpp +++ b/engines/fullpipe/inventory.cpp @@ -299,7 +299,7 @@ void Inventory2::draw() { else icn->pictureObjectNormal->drawAt(icn->x1, icn->y1 + 10); } - } + } if (!_isInventoryOut) goto LABEL_30; @@ -434,7 +434,7 @@ bool Inventory2::unselectItem(bool flag) { for (uint i = 0; i < _inventoryIcons.size(); i++) { if (_inventoryIcons[i]->isSelected) _inventoryIcons[i]->isSelected = false; - } + } g_fp->getGameLoaderInputController()->setCursorItemPicture(0); @@ -470,7 +470,7 @@ int Inventory2::getHoveredItem(Common::Point *point) { icn->isMouseHover = true; return icn->inventoryItemId; } - } + } return 0; } diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp index c40af3b062..8067b679f7 100644 --- a/engines/fullpipe/messagehandlers.cpp +++ b/engines/fullpipe/messagehandlers.cpp @@ -330,7 +330,7 @@ int global_messageHandler2(ExCommand *cmd) { for (int snd = 0; snd < g_fp->_currSoundListCount; snd++) { SoundList *s = g_fp->_currSoundList1[snd]; - int ms = s->getCount(); + int ms = s->getCount(); for (int i = 0; i < ms; i++) { s->getSoundByIndex(i)->setPanAndVolumeByStaticAni(); } diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp index 9ddf0fda4e..147a35cbd7 100644 --- a/engines/fullpipe/messages.cpp +++ b/engines/fullpipe/messages.cpp @@ -584,7 +584,7 @@ void MessageQueue::replaceKeyCode(int key1, int key2) { if ((k == 1 || k == 20 || k == 5 || k == 6 || k == 2 || k == 18 || k == 19 || k == 22 || k == 55) && ex->_keyCode == key1) ex->_keyCode = key2; - } + } } int MessageQueue::calcDuration(StaticANIObject *obj) { @@ -618,7 +618,7 @@ void MessageQueue::changeParam28ForObjectId(int objId, int oldParam28, int newPa && ex->_keyCode == oldParam28 && ex->_parentId == objId) ex->_keyCode = newParam28; - } + } } int MessageQueue::activateExCommandsByKind(int kind) { diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index aab4843067..898f4c53ae 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -1058,7 +1058,7 @@ void ModalMainMenu::updateSoundVolume(Sound *snd) { dx = ani->_oy - _screct.bottom; } - par = 0; + par = 0; if (dx > 800) { snd->setPanAndVolume(-3500, 0); diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 81d92ccac8..6f41e94cee 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -630,7 +630,7 @@ MessageQueue *MctlLadder::makeQueue(StaticANIObject *ani, int xpos, int ypos, in mkQueue.flags = 14; mkQueue.movementId = _ladmovements[pos]->movVars->varDownGo; - return _aniHandler.makeRunQueue(&mkQueue); + return _aniHandler.makeRunQueue(&mkQueue); } MessageQueue *MctlLadder::controllerWalkTo(StaticANIObject *ani, int off) { @@ -2672,7 +2672,7 @@ MessageQueue *MctlGraph::makeLineQueue(MctlMQ *info) { mq->addExCommandToEnd(ex); } - ex = new ExCommand(_items2[info->index]->_objectId, 5, -1, info->pt2.x, info->pt2.y, 0, 1, 0, 0, 0); + 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->_keyCode = _items2[info->index]->_obj->_okeyCode; diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp index 70f5f1aa81..6f23431203 100644 --- a/engines/fullpipe/scene.cpp +++ b/engines/fullpipe/scene.cpp @@ -424,7 +424,7 @@ void Scene::preloadMovements(GameVar *var) { ani->loadMovementsPixelData(); } } - } + } } void Scene::initObjectCursors(const char *varname) { @@ -440,12 +440,12 @@ void Scene::initObjectCursors(const char *varname) { GameObject *obj = getPictureObjectByName(sub->_varName, -1); if (obj || (obj = getStaticANIObject1ByName(sub->_varName, -1)) != 0) { - if (obj->_id < minId) - minId = obj->_id; - if (obj->_id > maxId) - maxId = obj->_id; - } - } + if (obj->_id < minId) + minId = obj->_id; + if (obj->_id > maxId) + maxId = obj->_id; + } + } g_fp->_minCursorId = minId; g_fp->_maxCursorId = maxId; @@ -732,7 +732,7 @@ void Scene::drawContent(int minPri, int maxPri, bool drawBg) { break; } } - } + } for (uint i = 1; i < _picObjList.size(); i++) { diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index cb9f8c4c01..5a6380103c 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -1156,12 +1156,12 @@ void FullpipeEngine::updateMap(PreloadItem *pre) { if (pre->keyCode == TrubaLeft) { updateMapPiece(PIC_MAP_P04, 1); - } + } if (pre->keyCode == TrubaUp) { updateMapPiece(PIC_MAP_P05, 1); updateMapPiece(PIC_MAP_A11, 1); - } + } break; @@ -1433,7 +1433,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) { break; } break; - } + } } void BallChain::init(Ball **ball) { diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index b6239c219f..7351c33f9c 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -984,7 +984,7 @@ void sceneHandler04_springWobble() { void sceneHandler04_leaveScene() { g_fp->_aniMan2 = 0; - MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC4_MANTOBOTTLE), 0, 0); + MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC4_MANTOBOTTLE), 0, 0); ExCommand *ex = 0; for (uint i = 0; i < mq->getCount(); i++) { diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp index 8864794691..b2efd29dda 100644 --- a/engines/fullpipe/scenes/scene05.cpp +++ b/engines/fullpipe/scenes/scene05.cpp @@ -124,7 +124,7 @@ void sceneHandler05_makeWackoFeedback() { void sceneHandler05_resetTicks() { if (g_fp->_aniMan->_movement && (g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP - || g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN)) + || g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN)) g_vars->scene05_wackoTicker = g_fp->_updateTicks; else g_vars->scene05_wackoTicker = 0; diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp index 14042031bf..ac2adcdb8c 100644 --- a/engines/fullpipe/scenes/scene06.cpp +++ b/engines/fullpipe/scenes/scene06.cpp @@ -60,7 +60,7 @@ int scene06_updateCursor() { return PIC_CSR_ITN; } } else if (g_fp->_objectAtCursor && (StaticANIObject *)g_fp->_objectAtCursor == g_vars->scene06_currentBall - && g_fp->_cursorId == PIC_CSR_DEFAULT) { + && g_fp->_cursorId == PIC_CSR_DEFAULT) { g_fp->_cursorId = PIC_CSR_ITN; } } @@ -143,19 +143,19 @@ void sceneHandler06_mumsyBallTake() { int momAni = 0; switch (g_vars->scene06_mumsyNumBalls) { - case 1: + case 1: momAni = MV_MOM_TAKE1; break; - case 2: + case 2: momAni = MV_MOM_TAKE2; break; - case 3: + case 3: momAni = MV_MOM_TAKE3; break; - case 4: + case 4: momAni = MV_MOM_TAKE4; break; - case 5: + case 5: momAni = MV_MOM_TAKE5; break; } @@ -361,7 +361,7 @@ void sceneHandler06_throwCallback(int *arg) { if (g_vars->scene06_aimingBall) { int dist = (g_fp->_mouseVirtY - g_vars->scene06_sceneClickY) * (g_fp->_mouseVirtY - g_vars->scene06_sceneClickY) - + (g_fp->_mouseVirtX - g_vars->scene06_sceneClickX) + + (g_fp->_mouseVirtX - g_vars->scene06_sceneClickX) * (g_fp->_mouseVirtX - g_vars->scene06_sceneClickX); *arg = (int)(sqrt((double)dist) * 0.1); diff --git a/engines/fullpipe/scenes/scene07.cpp b/engines/fullpipe/scenes/scene07.cpp index 6f98d014bc..14ee5f1daa 100644 --- a/engines/fullpipe/scenes/scene07.cpp +++ b/engines/fullpipe/scenes/scene07.cpp @@ -133,7 +133,7 @@ int sceneHandler07(ExCommand *ex) { break; - case MSG_SC7_CLOSELUKE: + case MSG_SC7_CLOSELUKE: sceneHandler07_closeLuke(); break; diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp index d64df8688e..419705164c 100644 --- a/engines/fullpipe/scenes/scene08.cpp +++ b/engines/fullpipe/scenes/scene08.cpp @@ -298,13 +298,13 @@ void sceneHandler08_standUp() { } void sceneHandler08_jumpLogic(ExCommand *cmd) { - if (g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY) == PIC_SC8_LADDERD) { - sceneHandler08_jumpOff(cmd); + if (g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY) == PIC_SC8_LADDERD) { + sceneHandler08_jumpOff(cmd); - cmd->_messageKind = 0; - } else { - sceneHandler08_standUp(); - } + cmd->_messageKind = 0; + } else { + sceneHandler08_standUp(); + } } void sceneHandler08_badLuck() { @@ -371,9 +371,9 @@ void sceneHandler08_calcFlight() { && g_fp->_aniMan->_statics && g_fp->_aniMan->_statics->_staticsId == ST_MAN8_HANDSUP) { sceneHandler08_badLuck(); } else if (g_fp->_aniMan->_oy > 236 || g_vars->scene08_stairsVisible - || !g_fp->_aniMan->_statics || g_fp->_aniMan->_statics->_staticsId != ST_MAN8_HANDSUP) { + || !g_fp->_aniMan->_statics || g_fp->_aniMan->_statics->_staticsId != ST_MAN8_HANDSUP) { if (g_fp->_aniMan->_movement || g_fp->_aniMan->_oy < 660 - || (g_vars->scene08_vmyats->_movement && g_vars->scene08_vmyats->_movement->_currDynamicPhaseIndex > 0) + || (g_vars->scene08_vmyats->_movement && g_vars->scene08_vmyats->_movement->_currDynamicPhaseIndex > 0) || abs(g_vars->scene08_manOffsetY) > 2) { if (g_vars->scene08_manOffsetY >= 0 && !g_fp->_aniMan->_movement) { if (g_fp->_aniMan->_statics->_staticsId == ST_MAN8_HANDSUP) diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp index ffe8a1b2de..613149930d 100644 --- a/engines/fullpipe/scenes/scene09.cpp +++ b/engines/fullpipe/scenes/scene09.cpp @@ -440,7 +440,7 @@ void sceneHandler09_limitHangerPhase() { if (g_vars->scene09_hangers[i]->phase > 0) g_vars->scene09_hangers[i]->field_8--; } - } + } } void sceneHandler09_collideBall(Ball *ball) { diff --git a/engines/fullpipe/scenes/scene10.cpp b/engines/fullpipe/scenes/scene10.cpp index 3e2a918b64..527c942f5f 100644 --- a/engines/fullpipe/scenes/scene10.cpp +++ b/engines/fullpipe/scenes/scene10.cpp @@ -129,7 +129,7 @@ int sceneHandler10(ExCommand *ex) { switch(ex->_messageNum) { case MSG_LIFT_CLOSEDOOR: g_fp->lift_closedoorSeq(); - break; + break; case MSG_LIFT_EXITLIFT: g_fp->lift_exitSeq(ex); @@ -144,7 +144,7 @@ int sceneHandler10(ExCommand *ex) { break; case MSG_SC10_LADDERTOBACK: - g_vars->scene10_ladder->_priority = 49; + g_vars->scene10_ladder->_priority = 49; break; case MSG_SC10_LADDERTOFORE: diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp index 1a8fa8ed67..cdd8e5f0a0 100644 --- a/engines/fullpipe/scenes/scene11.cpp +++ b/engines/fullpipe/scenes/scene11.cpp @@ -139,7 +139,7 @@ void scene11_initScene(Scene *sc) { getSc2MctlCompoundBySceneId(sc->_sceneId)->replaceNodeX(303, 353); } else if (swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInBoots) - || swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInCorner)) { + || swingie == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInCorner)) { g_vars->scene11_swingIsSwinging = false; g_vars->scene11_swingieStands = true; @@ -315,8 +315,8 @@ void sceneHandler11_jumpFromSwing() { g_vars->scene11_dudeOnSwing->_priority = 20; g_vars->scene11_dudeOnSwing->_flags |= 4; - MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); - ExCommand *ex = new ExCommand(g_fp->_aniMan->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0); + MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); + ExCommand *ex = new ExCommand(g_fp->_aniMan->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0); ex->_field_14 = 256; ex->_messageNum = 0; ex->_excFlags |= 3; @@ -551,7 +551,7 @@ void sceneHandler11_swingieSit() { } void sceneHandler11_swingieJumpDown() { - MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SWR_JUMPDOWN), 0, 0); + MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SWR_JUMPDOWN), 0, 0); mq->setFlags(mq->getFlags() | 1); @@ -590,7 +590,7 @@ int sceneHandler11(ExCommand *cmd) { case MSG_SC11_SITSWINGER: if (g_fp->getObjectState(sO_Swingie) == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInBoots) - || g_fp->getObjectState(sO_Swingie) == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInCorner)) { + || g_fp->getObjectState(sO_Swingie) == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInCorner)) { g_fp->setObjectState(sO_Swingie, g_fp->getObjectEnumState(sO_Swingie, sO_IsSitting)); } break; diff --git a/engines/fullpipe/scenes/scene13.cpp b/engines/fullpipe/scenes/scene13.cpp index 1397248bd5..59be7a5e85 100644 --- a/engines/fullpipe/scenes/scene13.cpp +++ b/engines/fullpipe/scenes/scene13.cpp @@ -111,15 +111,15 @@ void sceneHandler13_testClose() { void sceneHandler13_testOpen() { switch (g_vars->scene13_handleR->_statics->_staticsId) { - case ST_HDLR_DOWN: + case ST_HDLR_DOWN: chainQueue(QU_SC13_OPENFAIL, 1); break; - case ST_HDLR_DOWN_GUM: + case ST_HDLR_DOWN_GUM: chainQueue(QU_SC13_OPENSUCCESS, 1); break; - case ST_HDLR_GUM: + case ST_HDLR_GUM: g_vars->scene13_handleR->changeStatics2(ST_HDLR_DOWN_GUM); chainQueue(QU_SC13_OPENSUCCESS, 1); @@ -259,14 +259,14 @@ int sceneHandler13(ExCommand *cmd) { switch(cmd->_messageNum) { case MSG_SC13_OPENBRIDGE: sceneHandler13_openBridge(); - break; + break; case MSG_SC13_TESTCLOSE: sceneHandler13_testClose(); break; case MSG_SC13_TESTOPEN: - sceneHandler13_testOpen(); + sceneHandler13_testOpen(); break; case MSG_SC13_CLOSEBRIDGE: diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp index d3ba3c345e..859d832b93 100644 --- a/engines/fullpipe/scenes/scene14.cpp +++ b/engines/fullpipe/scenes/scene14.cpp @@ -809,14 +809,14 @@ int sceneHandler14(ExCommand *cmd) { break; case 29: - if (g_vars->scene14_arcadeIsOn) { + if (g_vars->scene14_arcadeIsOn) { int pixel; if (g_vars->scene14_dudeCanKick && g_fp->_aniMan->getPixelAtPos(cmd->_sceneClickX, cmd->_sceneClickY, &pixel) && !g_fp->_aniMan->_movement) { sceneHandler14_dudeDecline(); break; } - } else { + } else { StaticANIObject *ani = g_fp->_currentScene->getStaticANIObjectAtPos(cmd->_sceneClickX, cmd->_sceneClickY); if (ani && ani->_id == ANI_LIFTBUTTON) { @@ -839,9 +839,9 @@ int sceneHandler14(ExCommand *cmd) { } } } - } + } break; - } + } return 0; } diff --git a/engines/fullpipe/scenes/scene17.cpp b/engines/fullpipe/scenes/scene17.cpp index d40f8cf816..f19fd030e0 100644 --- a/engines/fullpipe/scenes/scene17.cpp +++ b/engines/fullpipe/scenes/scene17.cpp @@ -184,7 +184,7 @@ int sceneHandler17(ExCommand *cmd) { g_vars->scene17_handPhase = true; } - break; + break; case MSG_SC17_FILLBOTTLE: sceneHandler17_fillBottle(); diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp index 5af7ef9043..5abb5a037e 100644 --- a/engines/fullpipe/scenes/scene18and19.cpp +++ b/engines/fullpipe/scenes/scene18and19.cpp @@ -52,7 +52,7 @@ struct Swinger { #define ANGLE(x) ((x) * M_PI / 180) void scene18_preload() { - g_fp->_scene3 = 0; + g_fp->_scene3 = 0; for (SceneTagList::iterator s = g_fp->_gameProject->_sceneTagList->begin(); s != g_fp->_gameProject->_sceneTagList->end(); ++s) { if (s->_sceneId == SC_18) { diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp index 7f19f175cc..ab3e474070 100644 --- a/engines/fullpipe/scenes/scene20.cpp +++ b/engines/fullpipe/scenes/scene20.cpp @@ -73,7 +73,7 @@ void scene20_initScene(Scene *sc) { } else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnTheFloor)) { g_vars->scene20_grandma->changeStatics2(ST_GMA20_FLOOR); } else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe) - || g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipeWithStool)) { + || g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipeWithStool)) { g_vars->scene20_grandma->changeStatics2(ST_GMA20_STAND); } else { g_vars->scene20_grandma->hide(); diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp index 84cd5f9a9a..4e7c438cba 100644 --- a/engines/fullpipe/scenes/scene22.cpp +++ b/engines/fullpipe/scenes/scene22.cpp @@ -55,7 +55,7 @@ void scene22_initScene(Scene *sc) { g_vars->scene22_numBagFalls = 2; else { g_vars->scene22_numBagFalls = 3; - g_vars->scene22_craneIsOut = false; + g_vars->scene22_craneIsOut = false; } diff --git a/engines/fullpipe/scenes/scene23.cpp b/engines/fullpipe/scenes/scene23.cpp index d6075c271b..7f7715bc65 100644 --- a/engines/fullpipe/scenes/scene23.cpp +++ b/engines/fullpipe/scenes/scene23.cpp @@ -192,24 +192,24 @@ void sceneHandler23_spinWheel1() { int mv = 0; switch (g_vars->scene23_calend0->_statics->_staticsId) { - case ST_CND_0: + case ST_CND_0: mv = MV_CND_0_1; break; - case ST_CND_1: + case ST_CND_1: mv = MV_CND_1_2; break; - case ST_CND_2: + case ST_CND_2: mv = MV_CND_2_3; break; - case ST_CND_3: + case ST_CND_3: g_vars->scene23_calend0->changeStatics2(ST_CND_9); mv = MV_CND_9_0; break; - default: + default: break; } @@ -224,47 +224,47 @@ void sceneHandler23_spinWheel2and4(StaticANIObject *ani) { int mv = 0; switch (ani->_statics->_staticsId) { - case ST_CND_0: + case ST_CND_0: mv = MV_CND_0_1; break; - case ST_CND_1: + case ST_CND_1: mv = MV_CND_1_2; break; - case ST_CND_2: + case ST_CND_2: mv = MV_CND_2_3; break; - case ST_CND_3: + case ST_CND_3: mv = MV_CND_3_4; break; - case ST_CND_4: + case ST_CND_4: mv = MV_CND_4_5; break; - case ST_CND_5: + case ST_CND_5: mv = MV_CND_5_6; break; - case ST_CND_6: + case ST_CND_6: mv = MV_CND_6_7; break; - case ST_CND_7: + case ST_CND_7: mv = MV_CND_7_8; break; - case ST_CND_8: + case ST_CND_8: mv = MV_CND_8_9; break; - case ST_CND_9: + case ST_CND_9: mv = MV_CND_9_0; break; - default: + default: break; } @@ -352,19 +352,19 @@ void sceneHandler23_pushButton(ExCommand *cmd) { void sceneHandler23_sendClick(StaticANIObject *ani) { int msg = 0; switch (ani->_okeyCode) { - case 0: + case 0: msg = MSG_SC23_CLICKBTN1; break; - case 1: + case 1: msg = MSG_SC23_CLICKBTN2; break; - case 2: + case 2: msg = MSG_SC23_CLICKBTN3; break; - case 3: + case 3: msg = MSG_SC23_CLICKBTN4; break; - default: + default: break; } diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/fullpipe/scenes/scene24.cpp index 2eb536df3f..a2a20a2fe9 100644 --- a/engines/fullpipe/scenes/scene24.cpp +++ b/engines/fullpipe/scenes/scene24.cpp @@ -33,7 +33,6 @@ #include "fullpipe/interaction.h" #include "fullpipe/behavior.h" - namespace Fullpipe { void scene24_initScene(Scene *sc) { diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp index 07eda73cf2..a5fd53a819 100644 --- a/engines/fullpipe/scenes/scene25.cpp +++ b/engines/fullpipe/scenes/scene25.cpp @@ -33,7 +33,6 @@ #include "fullpipe/interaction.h" #include "fullpipe/behavior.h" - namespace Fullpipe { void scene25_showBoardOnRightFar() { @@ -608,34 +607,34 @@ int sceneHandler25(ExCommand *cmd) { if (y > g_fp->_sceneRect.bottom - 200) g_fp->_currentScene->_y = y + 300 - g_fp->_sceneRect.bottom; } - } + } - if (g_vars->scene25_beardersAreThere) { + if (g_vars->scene25_beardersAreThere) { g_vars->scene25_beardersCounter++; if (g_vars->scene25_beardersCounter >= 120) sceneHandler25_animateBearders(); - } + } - g_fp->_behaviorManager->updateBehaviors(); - g_fp->startSceneTrack(); + g_fp->_behaviorManager->updateBehaviors(); + g_fp->startSceneTrack(); - if (g_vars->scene25_waterIsPresent && !g_vars->scene25_water->_movement) + if (g_vars->scene25_waterIsPresent && !g_vars->scene25_water->_movement) g_vars->scene25_water->startAnim(MV_WTR25_FLOW, 0, -1); - if (g_vars->scene25_dudeIsOnBoard && !g_fp->_aniMan->_movement && g_vars->scene25_sneezeFlipper) + if (g_vars->scene25_dudeIsOnBoard && !g_fp->_aniMan->_movement && g_vars->scene25_sneezeFlipper) sceneHandler25_sneeze(); - g_vars->scene25_sneezeFlipper = true; + g_vars->scene25_sneezeFlipper = true; - if (g_vars->scene25_board->_flags & 4) { + if (g_vars->scene25_board->_flags & 4) { if (!g_vars->scene25_board->_movement) { if (g_vars->scene25_board->_statics->_staticsId & 0x4000) g_vars->scene25_board->startAnim(rMV_BRD25_RIGHT, 0, -1); else g_vars->scene25_board->startAnim(MV_BRD25_RIGHT, 0, -1); } - } + } break; case 29: diff --git a/engines/fullpipe/scenes/scene26.cpp b/engines/fullpipe/scenes/scene26.cpp index baed928d00..e8a0261524 100644 --- a/engines/fullpipe/scenes/scene26.cpp +++ b/engines/fullpipe/scenes/scene26.cpp @@ -196,7 +196,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { int qId = 0; switch (ani->_okeyCode) { - case 0: + case 0: if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Closed)) qId = QU_SC26_OPEN1; else @@ -204,7 +204,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { break; - case 1: + case 1: if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Closed)) qId = QU_SC26_OPEN2; else @@ -212,7 +212,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { break; - case 2: + case 2: if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Closed)) qId = QU_SC26_OPEN3; else @@ -220,7 +220,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { break; - case 3: + case 3: if (g_fp->getObjectState(sO_Valve4_26) == g_fp->getObjectEnumState(sO_Valve4_26, sO_Closed)) qId = QU_SC26_OPEN4; else @@ -228,7 +228,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { break; - case 4: + case 4: if (g_fp->getObjectState(sO_Valve5_26) == g_fp->getObjectEnumState(sO_Valve5_26, sO_Closed)) qId = QU_SC26_OPEN5; else @@ -236,7 +236,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { break; - default: + default: return; } diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp index b23f29ad4c..420629cf9c 100644 --- a/engines/fullpipe/scenes/scene27.cpp +++ b/engines/fullpipe/scenes/scene27.cpp @@ -297,10 +297,10 @@ void sceneHandler27_startAiming() { int phase = 21 - g_vars->scene27_launchPhase; - if (phase < 14) + if (phase < 14) phase = 14; - if (phase > 20) + if (phase > 20) phase = 20; g_fp->playSound(SND_27_044, 0); @@ -334,7 +334,7 @@ void sceneHandler27_wipeDo() { g_vars->scene27_bats[i]->field_10 = atan2(520.0 - g_vars->scene27_bats[i]->currY, 800.0 - g_vars->scene27_bats[i]->currX); g_vars->scene27_bats[i]->power += 1.0; } - } + } } bool sceneHandler27_batFallLogic(uint batn) { @@ -352,9 +352,9 @@ bool sceneHandler27_batFallLogic(uint batn) { if (batn != g_vars->scene27_var07.size() - 1) g_vars->scene27_var07.remove_at(batn); - } else if (!bat->ani->_movement) { + } else if (!bat->ani->_movement) { bat->ani->startAnim(MV_BTA_FALL, 0, -1); - } + } return true; } @@ -386,7 +386,7 @@ void sceneHandler27_knockBats(int bat1n, int bat2n) { bat1->powerSin -= pow1y * 1.1; rndF = ((double)g_fp->_rnd->getRandomNumber(32767) * 0.0000009155552842799158 - 0.015 - + atan2(bat1->currY - bat2->currY, bat1->currX - bat2->currX)); + + atan2(bat1->currY - bat2->currY, bat1->currX - bat2->currX)); double pow2x = cos(bat2->field_10 - rndF) * (double)((int)(bat1->currX - bat2->currX) >= 0 ? 1 : -1) * bat2->power; double pow2y = sin(bat2->field_10 - rndF) * (double)((int)(bat1->currY - bat2->currY) >= 0 ? 1 : -1) * bat2->power; @@ -394,7 +394,7 @@ void sceneHandler27_knockBats(int bat1n, int bat2n) { bat2->powerSin -= pow2y * 1.1; double dy = bat1->currY - bat2->currY; - double dx = bat1->currX - bat2->currX; + double dx = bat1->currX - bat2->currX; double dist = (sqrt(rndSin * rndSin * 0.25 + rndCos * rndCos) * 54.0 - sqrt(dx * dx + dy * dy)) / cos(rndF - bat1->field_10); bat1->currX -= cos(bat1->field_10) * (dist + 1.0); bat1->currY -= sin(bat1->field_10) * (dist + 1.0); diff --git a/engines/fullpipe/scenes/scene30.cpp b/engines/fullpipe/scenes/scene30.cpp index ca2324e647..ce123e30a8 100644 --- a/engines/fullpipe/scenes/scene30.cpp +++ b/engines/fullpipe/scenes/scene30.cpp @@ -55,7 +55,7 @@ void scene30_initScene(Scene *sc, int flag) { g_vars->scene30_leg->changeStatics2(ST_LEG_UP); else if (g_fp->getObjectState(sO_Leg) == g_fp->getObjectEnumState(sO_Leg, sO_WithoutJugs)) g_vars->scene30_leg->changeStatics2(ST_LEG_DOWN); - else if (g_fp->getObjectState(sO_Leg) == g_fp->getObjectEnumState(sO_Leg, sO_WithBig)) + else if (g_fp->getObjectState(sO_Leg) == g_fp->getObjectEnumState(sO_Leg, sO_WithBig)) g_vars->scene30_leg->changeStatics2(ST_LEG_DOWN1); else if (g_fp->getObjectState(sO_Leg) == g_fp->getObjectEnumState(sO_Leg, sO_WithSmall)) g_vars->scene30_leg->changeStatics2(ST_LEG_DOWN2); diff --git a/engines/fullpipe/scenes/sceneIntro.cpp b/engines/fullpipe/scenes/sceneIntro.cpp index 5e69cf1d7a..32401bc079 100644 --- a/engines/fullpipe/scenes/sceneIntro.cpp +++ b/engines/fullpipe/scenes/sceneIntro.cpp @@ -96,7 +96,7 @@ int sceneHandlerIntro(ExCommand *ex) { if (!g_vars->sceneIntro_aniin1man->_movement && g_vars->sceneIntro_aniin1man->_statics->_staticsId == ST_IN1MAN_SLEEP) g_vars->sceneIntro_aniin1man->startAnim(MV_IN1MAN_SLEEP, 0, -1); } else if (g_vars->sceneIntro_needGetup && !g_vars->sceneIntro_aniin1man->_movement && - g_vars->sceneIntro_aniin1man->_statics->_staticsId == ST_IN1MAN_SLEEP) { + g_vars->sceneIntro_aniin1man->_statics->_staticsId == ST_IN1MAN_SLEEP) { g_vars->sceneIntro_needGetup = 0; chainQueue(QU_INTR_GETUPMAN, 0); diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp index 398e28d11b..635ac0acbd 100644 --- a/engines/fullpipe/sound.cpp +++ b/engines/fullpipe/sound.cpp @@ -162,7 +162,7 @@ void Sound::setPanAndVolumeByStaticAni() { dx = ani->_oy - g_fp->_sceneRect.bottom; } - par = 0; + par = 0; if (dx > 800) { setPanAndVolume(-3500, 0); diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index d8cb3390f8..ec834a9631 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -192,7 +192,7 @@ StaticANIObject::StaticANIObject(StaticANIObject *src) : GameObject(src) { if (src->_movements[i]->_currMovement) { // WORKAROUND: Original uses weird construction here: - // new Movement(getMovementById(src->getMovementIdById(mov->_id)), this); + // new Movement(getMovementById(src->getMovementIdById(mov->_id)), this); newmov = new Movement(src->getMovementById(src->getMovementIdById(src->_movements[i]->_id)), this); newmov->_id = src->_movements[i]->_id; } else { @@ -1989,7 +1989,7 @@ bool Movement::gotoNextFrame(void (*callback1)(int, Common::Point *point, int, i return false; } } else if ((uint)_currDynamicPhaseIndex == _dynamicPhases.size() - 1 - && !(_dynamicPhases.back()->_countdown)) { + && !(_dynamicPhases.back()->_countdown)) { return false; } } |