diff options
| author | Eric Fry | 2018-06-26 22:35:31 +1000 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 989d8d9b8abecee3f0b72c92a05067e128fc6cdd (patch) | |
| tree | 6879c75dccd45e4ae6f2396ee62425f625494f37 /engines/illusions/bbdou/bbdou_bubble.cpp | |
| parent | 7cadb7ad0ce7b24c28d3fa9d842f7083ae5b9056 (diff) | |
| download | scummvm-rg350-989d8d9b8abecee3f0b72c92a05067e128fc6cdd.tar.gz scummvm-rg350-989d8d9b8abecee3f0b72c92a05067e128fc6cdd.tar.bz2 scummvm-rg350-989d8d9b8abecee3f0b72c92a05067e128fc6cdd.zip | |
ILLUSIONS: Formatting, remove trailing whitespace.
Diffstat (limited to 'engines/illusions/bbdou/bbdou_bubble.cpp')
| -rw-r--r-- | engines/illusions/bbdou/bbdou_bubble.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/illusions/bbdou/bbdou_bubble.cpp b/engines/illusions/bbdou/bbdou_bubble.cpp index 62e7959830..c631a22109 100644 --- a/engines/illusions/bbdou/bbdou_bubble.cpp +++ b/engines/illusions/bbdou/bbdou_bubble.cpp @@ -101,7 +101,7 @@ void BbdouBubble::addItem0(uint32 sequenceId1, uint32 sequenceId2, uint32 progRe } void BbdouBubble::show() { - + if (_prevItem0) { hide(); } @@ -110,14 +110,14 @@ void BbdouBubble::show() { _currItem0 = 0; calcBubbles(_pt1, _pt2); - + Control *control = _vm->_dict->getObjectControl(_prevItem0->_objectId); control->setActorPosition(_pt2); control->startSequenceActor(0x60057, 2, 0); control->startSequenceActor(_prevItem0->_sequenceId1, 2, 0); control->appearActor(); control->deactivateObject(); - + for (uint i = 0; i < 32; ++i) { if (_items[i]._enabled == 1) { Control *subControl = _vm->_dict->getObjectControl(_items[i]._objectId); @@ -125,7 +125,7 @@ void BbdouBubble::show() { subControl->startSequenceActor(_items[i]._sequenceId, 2, 0); } } - + } void BbdouBubble::hide() { @@ -156,7 +156,7 @@ void BbdouBubble::setup(int16 minCount, Common::Point pt1, Common::Point pt2, ui if (item0->_count < maxCount && item0->_count >= minCount && (!progResKeywordId || item0->_progResKeywordId == progResKeywordId)) { maxCount = item0->_count; - _currItem0 = item0; + _currItem0 = item0; } } _pt1 = pt1; @@ -204,7 +204,7 @@ void BbdouBubble::calcBubbles(Common::Point &pt1, Common::Point &pt2) { for (int i = 0; i < kSequenceIdsCount; ++i) sequenceCounters[i] = 0; - + if (pt2.y >= pt1.y) { swapY = true; if (pt1.x == pt2.x) |