diff options
author | Eugene Sandulenko | 2013-09-06 15:58:05 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2013-09-06 15:58:05 +0300 |
commit | af91d2a5ce61f395b207854e589ae917c623818f (patch) | |
tree | 762f7cd9dee3907e5c7609760c1b6482d94f153d | |
parent | c55862a378f3c8d76fcfafaad1c2e993e663da46 (diff) | |
download | scummvm-rg350-af91d2a5ce61f395b207854e589ae917c623818f.tar.gz scummvm-rg350-af91d2a5ce61f395b207854e589ae917c623818f.tar.bz2 scummvm-rg350-af91d2a5ce61f395b207854e589ae917c623818f.zip |
FULLPIPE: Whitespace fix
-rw-r--r-- | engines/fullpipe/gameloader.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/gfx.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/input.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/interaction.cpp | 6 | ||||
-rw-r--r-- | engines/fullpipe/inventory.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/modal.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/statics.cpp | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp index a91065fe87..f48c407a57 100644 --- a/engines/fullpipe/gameloader.cpp +++ b/engines/fullpipe/gameloader.cpp @@ -170,7 +170,7 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) { return true; } - if (_sc2array[sc2idx]._entranceDataCount <= 0 ) + if (_sc2array[sc2idx]._entranceDataCount <= 0) return false; int entranceIdx; diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp index 5f77f76310..c46bdfab55 100644 --- a/engines/fullpipe/gfx.cpp +++ b/engines/fullpipe/gfx.cpp @@ -633,7 +633,7 @@ bool Picture::isPixelHitAtPos(int x, int y) { if (x < _x || y < _y || x >= _x + _width || y >= _y + _height) return false; - if (!_bitmap ) + if (!_bitmap) init(); _bitmap->_x = _x; diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp index eb528f0ac1..f71a524c48 100644 --- a/engines/fullpipe/input.cpp +++ b/engines/fullpipe/input.cpp @@ -202,7 +202,7 @@ void FullpipeEngine::updateCursorsCommon() { _cursorId = PIC_CSR_GOFAR_R; return; } - if (_mouseVirtX - _sceneRect.left < 47 && _sceneRect.left > 0 ) { + if (_mouseVirtX - _sceneRect.left < 47 && _sceneRect.left > 0) { _cursorId = PIC_CSR_GOFAR_L; return; } diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index 9b480dfeb1..a5977c04bc 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -44,8 +44,8 @@ bool CInteractionController::compareInteractions(const void *p1, const void *p2) const CInteraction *i1 = (const CInteraction *)p1; const CInteraction *i2 = (const CInteraction *)p2; - if ( i2->_sceneId < i1->_sceneId) { - if ( i1->_sceneId != static_compSceneId) + if (i2->_sceneId < i1->_sceneId) { + if (i1->_sceneId != static_compSceneId) return false; } if (i2->_sceneId != i1->_sceneId) { @@ -60,7 +60,7 @@ bool CInteractionController::compareInteractions(const void *p1, const void *p2) goto LABEL_18; if (i1->_objectId3 != -1 && i1->_objectId3 != -2) { LABEL_17: - if (i2->_objectId3 != -2 ) + if (i2->_objectId3 != -2) return true; LABEL_18: if (i1->_objectId3 != -1) diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp index 41940f4b2d..1abd369e7b 100644 --- a/engines/fullpipe/inventory.cpp +++ b/engines/fullpipe/inventory.cpp @@ -386,7 +386,7 @@ bool CInventory2::unselectItem(bool flag) { int CInventory2::getHoveredItem(Common::Point *point) { int selId = getSelectedItemId(); - if (point->y <= 20 && !_isInventoryOut && !_isLocked ) + if (point->y <= 20 && !_isInventoryOut && !_isLocked) slideOut(); if (!selId && point->y >= 55) { diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index f7bc633ca6..6f1bc0cc1f 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -75,7 +75,7 @@ bool CModalIntro::handleMessage(ExCommand *message) { if (message->_messageNum != 36) return false; - if (message->_keyCode != 13 && message->_keyCode != 27 && message->_keyCode != 32 ) + if (message->_keyCode != 13 && message->_keyCode != 27 && message->_keyCode != 32) return false; if (_needRedraw) { diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 08e848274e..7f083101f9 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -256,7 +256,7 @@ void StaticANIObject::queueMessageQueue(MessageQueue *mq) { } MessageQueue *StaticANIObject::getMessageQueue() { - if (this->_messageQueueId <= 0 ) + if (this->_messageQueueId <= 0) return 0; return g_fullpipe->_globalMessageQueueList->getMessageQueueById(_messageQueueId); @@ -1389,7 +1389,7 @@ void Movement::loadPixelData() { mov = i; for (uint i = 0; i < _dynamicPhases.size(); i++) { - if ((Statics *)_dynamicPhases[i] != mov->_staticsObj2 || !(mov->_staticsObj2->_staticsId & 0x4000) ) + if ((Statics *)_dynamicPhases[i] != mov->_staticsObj2 || !(mov->_staticsObj2->_staticsId & 0x4000)) ((Statics *)_dynamicPhases[i])->getPixelData(); } |