diff options
author | Eugene Sandulenko | 2018-06-20 14:39:09 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | 85e0c7ccd330b8e59faa7d63a439ddd21c598d6f (patch) | |
tree | ed8b5b1e16e15dcf6e5dda4f418a1b871b4b4d6f /engines/pink/objects | |
parent | 9c176c57023cc77c82a73e533e4ace59d2529f8d (diff) | |
download | scummvm-rg350-85e0c7ccd330b8e59faa7d63a439ddd21c598d6f.tar.gz scummvm-rg350-85e0c7ccd330b8e59faa7d63a439ddd21c598d6f.tar.bz2 scummvm-rg350-85e0c7ccd330b8e59faa7d63a439ddd21c598d6f.zip |
PINK: JANITORIAL: Indentation fixes
Diffstat (limited to 'engines/pink/objects')
-rw-r--r-- | engines/pink/objects/actions/action_loop.cpp | 4 | ||||
-rw-r--r-- | engines/pink/objects/actions/action_play_with_sfx.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/actors/lead_actor.cpp | 54 | ||||
-rw-r--r-- | engines/pink/objects/handlers/handler_timer.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/inventory.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/sequences/sequencer.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/side_effect.cpp | 2 |
7 files changed, 34 insertions, 34 deletions
diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp index 79946ade46..ed548ef30c 100644 --- a/engines/pink/objects/actions/action_loop.cpp +++ b/engines/pink/objects/actions/action_loop.cpp @@ -37,7 +37,7 @@ void ActionLoop::deserialize(Archive &archive) { style = archive.readWORD(); switch (style) { case kPingPong: - _style = kPingPong; + _style = kPingPong; break; case kRandom: _style = kRandom; // haven't seen @@ -113,7 +113,7 @@ void ActionLoop::onStart() { _inLoop = true; } - if (!isTalk()) + if (!isTalk()) _actor->endAction(); _forward = true; diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp index b70cb56086..e50c2f850f 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.cpp +++ b/engines/pink/objects/actions/action_play_with_sfx.cpp @@ -55,7 +55,7 @@ void ActionPlayWithSfx::update() { setFrame(_startFrame); decodeNext(); } else - ActionPlay::update(); + ActionPlay::update(); for (uint i = 0; i < _sfxArray.size(); ++i) { if (_sfxArray[i]->getFrame() == currFrame) diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp index 847aa00ed2..549a8f265e 100644 --- a/engines/pink/objects/actors/lead_actor.cpp +++ b/engines/pink/objects/actors/lead_actor.cpp @@ -471,32 +471,32 @@ void PubPink::updateCursor(const Common::Point point) { } bool PubPink::sendUseClickMessage(Actor *actor) { - if (!LeadActor::sendUseClickMessage(actor) && playingMiniGame()) { - _nextState = _state; - _state = kPlayingSequence; - - const char *roundName; - switch (_round++ % 3) { - case 0: - roundName = kFirstRound; - break; - case 1: - roundName = kSecondRound; - break; - case 2: - roundName = kThirdRound; - break; - default: - roundName = nullptr; - assert(0); - } - _sequencer->authorSequence(_sequencer->findSequence(roundName), 0); - } - - if (playingMiniGame()) - _isHaveItem = true; - - return true; + if (!LeadActor::sendUseClickMessage(actor) && playingMiniGame()) { + _nextState = _state; + _state = kPlayingSequence; + + const char *roundName; + switch (_round++ % 3) { + case 0: + roundName = kFirstRound; + break; + case 1: + roundName = kSecondRound; + break; + case 2: + roundName = kThirdRound; + break; + default: + roundName = nullptr; + assert(0); + } + _sequencer->authorSequence(_sequencer->findSequence(roundName), 0); + } + + if (playingMiniGame()) + _isHaveItem = true; + + return true; } WalkLocation *PubPink::getWalkDestination() { @@ -511,7 +511,7 @@ WalkLocation *PubPink::getWalkDestination() { bool PubPink::playingMiniGame() { return !(_page->checkValueOfVariable(kFoodPuzzle, "TRUE") || - _page->checkValueOfVariable(kFoodPuzzle, "UNDEFINED")); + _page->checkValueOfVariable(kFoodPuzzle, "UNDEFINED")); } } // End of namespace Pink diff --git a/engines/pink/objects/handlers/handler_timer.cpp b/engines/pink/objects/handlers/handler_timer.cpp index dc1c9bd152..308759451f 100644 --- a/engines/pink/objects/handlers/handler_timer.cpp +++ b/engines/pink/objects/handlers/handler_timer.cpp @@ -106,7 +106,7 @@ void HandlerTimerSequences::handle(Actor *actor) { assert(sequence); - sequencer->authorParallelSequence(sequence, 0); + sequencer->authorParallelSequence(sequence, 0); } } // End of namespace Pink diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp index f6682f17c7..89df8460d1 100644 --- a/engines/pink/objects/inventory.cpp +++ b/engines/pink/objects/inventory.cpp @@ -87,7 +87,7 @@ bool InventoryMgr::isPinkOwnsAnyItems() { void InventoryMgr::setItemOwner(const Common::String &owner, InventoryItem *item) { if (owner == item->getCurrentOwner()) - return; + return; if (item == _item && _lead->getName() != owner) _item = nullptr; diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp index a92ed54531..6b59788a43 100644 --- a/engines/pink/objects/sequences/sequencer.cpp +++ b/engines/pink/objects/sequences/sequencer.cpp @@ -63,7 +63,7 @@ Sequence *Sequencer::findSequence(const Common::String &name) { } void Sequencer::authorSequence(Sequence *sequence, bool loadingSave) { - if (_context) + if (_context) _context->getSequence()->forceEnd(); if (sequence) { diff --git a/engines/pink/objects/side_effect.cpp b/engines/pink/objects/side_effect.cpp index fe43261fd1..ff9e14db14 100644 --- a/engines/pink/objects/side_effect.cpp +++ b/engines/pink/objects/side_effect.cpp @@ -89,7 +89,7 @@ void SideEffectGameVariable::toConsole() { } void SideEffectModuleVariable::execute(Actor *actor) { - actor->getPage()->getModule()->setVariable(_name, _value); + actor->getPage()->getModule()->setVariable(_name, _value); } void SideEffectModuleVariable::toConsole() { |