From f6a7e004079e6f16025bed2e3826c811831e44e3 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 16 Feb 2014 18:48:31 +0100 Subject: FULLPIPE: Janitorial - Remove trailing spaces --- engines/fullpipe/inventory.cpp | 4 ++-- engines/fullpipe/messagehandlers.cpp | 2 +- engines/fullpipe/messages.cpp | 6 +++--- engines/fullpipe/motion.cpp | 10 +++++----- engines/fullpipe/scenes/scene04.cpp | 10 +++++----- engines/fullpipe/scenes/scene05.cpp | 8 ++++---- engines/fullpipe/scenes/scene06.cpp | 2 +- engines/fullpipe/scenes/scene34.cpp | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp index cf12a8279c..483631ed33 100644 --- a/engines/fullpipe/inventory.cpp +++ b/engines/fullpipe/inventory.cpp @@ -219,7 +219,7 @@ void Inventory2::rebuildItemRects() { InventoryIcon *icn = new InventoryIcon(); icn->inventoryItemId = _itemsPool[idx]->id; - + icn->pictureObjectNormal = _scene->getPictureObjectById(_itemsPool[idx]->pictureObjectNormal, 0); icn->pictureObjectHover = _scene->getPictureObjectById(_itemsPool[idx]->pictureObjectHover, 0); icn->pictureObjectSelected = _scene->getPictureObjectById(_itemsPool[idx]->pictureObjectSelected, 0); @@ -352,7 +352,7 @@ bool Inventory2::handleLeftClick(ExCommand *cmd) { bool res = false; for (uint i = 0; i < _inventoryIcons.size(); i++) { - if (cmd->_x >= _inventoryIcons[i]->x1 && cmd->_x <= _inventoryIcons[i]->x2 && + if (cmd->_x >= _inventoryIcons[i]->x1 && cmd->_x <= _inventoryIcons[i]->x2 && cmd->_y >= _inventoryIcons[i]->y1 && cmd->_y <= _inventoryIcons[i]->y2) { if (getSelectedItemId()) { if (getSelectedItemId() != _inventoryIcons[i]->inventoryItemId) diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp index 44a3e4cb60..80201cb440 100644 --- a/engines/fullpipe/messagehandlers.cpp +++ b/engines/fullpipe/messagehandlers.cpp @@ -151,7 +151,7 @@ int global_messageHandler1(ExCommand *cmd) { if (g_fp->_updateFlag && (invItem = g_fp->_inventory->getHoveredItem(&g_fp->_mouseScreenPos))) { g_fp->_cursorId = PIC_CSR_ITN; - if (!g_fp->_currSelectedInventoryItemId && !g_fp->_aniMan->_movement && + if (!g_fp->_currSelectedInventoryItemId && !g_fp->_aniMan->_movement && !(g_fp->_aniMan->_flags & 0x100) && g_fp->_aniMan->isIdle()) { int st = g_fp->_aniMan->_statics->_staticsId; ExCommand *newex = 0; diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp index 55b5daaeaa..f81fd8d0aa 100644 --- a/engines/fullpipe/messages.cpp +++ b/engines/fullpipe/messages.cpp @@ -47,7 +47,7 @@ ExCommand *ExCommand::createClone() { return new ExCommand(this); } -ExCommand::ExCommand(int16 parentId, int messageKind, int messageNum, int x, int y, int a7, int a8, int sceneClickX, int sceneClickY, int a11) : +ExCommand::ExCommand(int16 parentId, int messageKind, int messageNum, int x, int y, int a7, int a8, int sceneClickX, int sceneClickY, int a11) : Message(parentId, messageKind, x, y, a7, a8, sceneClickX, sceneClickY, a11) { _field_3C = 1; _messageNum = messageNum; @@ -182,7 +182,7 @@ ExCommand2 *ExCommand2::createClone() { Message::Message() { _messageKind = 0; - _parentId = 0; + _parentId = 0; _x = 0; _y = 0; @@ -900,7 +900,7 @@ void processMessages() { } void updateGlobalMessageQueue(int id, int objid) { - MessageQueue *m = g_fp->_globalMessageQueueList->getMessageQueueById(id); + MessageQueue *m = g_fp->_globalMessageQueueList->getMessageQueueById(id); if (m) { m->update(); } diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 61612a2ca4..9171dc1405 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -255,7 +255,7 @@ int MctlLadder::collisionDetection(StaticANIObject *man) { if ((double)(man->_oy - _ladderY) / (double)_height < 0.0) delta = -0.5; - else + else delta = 0.5; int res = (int)((double)(man->_oy - _ladderY) / (double)_height + delta); @@ -269,7 +269,7 @@ int MctlLadder::collisionDetection(StaticANIObject *man) { void MctlLadder::addObject(StaticANIObject *obj) { if (findObjectPos(obj) < 0) { MctlLadderMovement *movement = new MctlLadderMovement; - + if (initMovement(obj, movement)) { _mgm.addItem(obj->_id); _movements.push_back(movement); @@ -1693,7 +1693,7 @@ double MovGraph2::findMinPath(LinkInfo *linkInfoSource, LinkInfo *linkInfoDest, } else if (linkInfoSource->link) { linkInfoWorkSource.node = linkInfoSource->link->_movGraphNode1; linkInfoWorkSource.link = 0; - + Common::Array tmpList; double newDistance = findMinPath(&linkInfoWorkSource, linkInfoDest, &tmpList); @@ -1709,9 +1709,9 @@ double MovGraph2::findMinPath(LinkInfo *linkInfoSource, LinkInfo *linkInfoDest, linkInfoWorkSource.link = 0; linkInfoWorkSource.node = linkInfoSource->link->_movGraphNode2; - + tmpList.clear(); - + newDistance = findMinPath(&linkInfoWorkSource, linkInfoDest, &tmpList); if (newDistance >= 0 && (minDistance < 0.0 || newDistance < minDistance)) { diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index 332935072c..b2137ec627 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -263,8 +263,8 @@ void sceneHandler04_clickButton() { StaticANIObject *but = g_fp->_currentScene->getStaticANIObject1ById(ANI_BUTTON, -1); if (but) { - if (!g_vars->scene04_clock->_movement || - (g_vars->scene04_clock->_movement->_id == MV_CLK_GO && g_vars->scene04_clock->_movement->_currDynamicPhaseIndex > 3 && + if (!g_vars->scene04_clock->_movement || + (g_vars->scene04_clock->_movement->_id == MV_CLK_GO && g_vars->scene04_clock->_movement->_currDynamicPhaseIndex > 3 && g_vars->scene04_clock->_movement->_currDynamicPhaseIndex < 105)) { if (!g_vars->scene04_hand->_movement && !g_vars->scene04_bottleIsTaken) { but->startAnim(MV_BTN_CLICK, 0, -1); @@ -1196,7 +1196,7 @@ void sceneHandler04_takeBottle() { void sceneHandler04_takeKozyawka() { if (g_vars->scene04_kozyawkiAni.size() > 0) { - if (g_vars->scene04_kozyawkiAni.size() == 1) + if (g_vars->scene04_kozyawkiAni.size() == 1) g_vars->scene04_objectIsTaken = true; StaticANIObject *koz = g_vars->scene04_kozyawkiAni.front(); @@ -1284,7 +1284,7 @@ int sceneHandler04(ExCommand *ex) { case MSG_UPDATEBOTTLE: sceneHandler04_updateBottle(); break; - + case MSG_CLICKBOTTLE: sceneHandler04_clickBottle(); break; @@ -1486,7 +1486,7 @@ int sceneHandler04(ExCommand *ex) { case MSG_SC4_DROPBOTTLE: sceneHandler04_dropBottle(); break; - + case MSG_SC4_COINOUT: g_vars->scene04_clock->changeStatics2(ST_CLK_CLOSED); g_vars->scene04_coinPut = false; diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp index c6e21daf1e..1a728794aa 100644 --- a/engines/fullpipe/scenes/scene05.cpp +++ b/engines/fullpipe/scenes/scene05.cpp @@ -123,7 +123,7 @@ void sceneHandler05_makeWackoFeedback() { } void sceneHandler05_resetTicks() { - if (g_fp->_aniMan->_movement && (g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP + if (g_fp->_aniMan->_movement && (g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP || g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN)) g_vars->scene05_wackoTicker = g_fp->_updateTicks; else @@ -312,7 +312,7 @@ int sceneHandler05(ExCommand *ex) { break; case MSG_SC5_MAKEOTMFEEDBACK: - if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP + if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP && g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { sceneHandler05_makeWackoFeedback(); g_vars->scene05_wackoTicker = 0; @@ -341,7 +341,7 @@ int sceneHandler05(ExCommand *ex) { sceneHandler05_testHatch(ex); break; - case 33: + case 33: { int res = 0; if (g_fp->_aniMan2) { @@ -356,7 +356,7 @@ int sceneHandler05(ExCommand *ex) { if (g_vars->scene05_wackoTicker) { if ((g_fp->_updateTicks - g_vars->scene05_wackoTicker) > 62) { - if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP + if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP && g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { if (g_vars->scene05_handleFlipper % 2) sceneHandler05_makeWackoFeedback(); diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp index 83b98c2722..2687db70b7 100644 --- a/engines/fullpipe/scenes/scene06.cpp +++ b/engines/fullpipe/scenes/scene06.cpp @@ -671,7 +671,7 @@ int sceneHandler06(ExCommand *ex) { if (!pic || !canInteractAny(g_fp->_aniMan, pic, ex->_keyCode)) { if ((g_fp->_sceneRect.right - ex->_sceneClickX < 47 - && g_fp->_sceneRect.right < g_fp->_sceneWidth - 1) + && g_fp->_sceneRect.right < g_fp->_sceneWidth - 1) || (ex->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) { g_fp->processArcade(ex); return 0; diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp index 0e690f4703..136dea59dd 100644 --- a/engines/fullpipe/scenes/scene34.cpp +++ b/engines/fullpipe/scenes/scene34.cpp @@ -216,7 +216,7 @@ void sceneHandler34_animateAction(ExCommand *cmd) { int qId = 0; if (ox == 887) { - if (oy != 370) + if (oy != 370) return; qId = QU_SC34_FROMSTOOL; -- cgit v1.2.3