Skip to content

Commit

Permalink
PINK: JANITORIAL: Indentation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
sev- committed Jun 28, 2018
1 parent 9c176c5 commit 85e0c7c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions engines/pink/objects/actions/action_loop.cpp
Expand Up @@ -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
Expand Down Expand Up @@ -113,7 +113,7 @@ void ActionLoop::onStart() {
_inLoop = true;
}

if (!isTalk())
if (!isTalk())
_actor->endAction();

_forward = true;
Expand Down
2 changes: 1 addition & 1 deletion engines/pink/objects/actions/action_play_with_sfx.cpp
Expand Up @@ -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)
Expand Down
54 changes: 27 additions & 27 deletions engines/pink/objects/actors/lead_actor.cpp
Expand Up @@ -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() {
Expand All @@ -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
2 changes: 1 addition & 1 deletion engines/pink/objects/handlers/handler_timer.cpp
Expand Up @@ -106,7 +106,7 @@ void HandlerTimerSequences::handle(Actor *actor) {

assert(sequence);

sequencer->authorParallelSequence(sequence, 0);
sequencer->authorParallelSequence(sequence, 0);
}

} // End of namespace Pink
2 changes: 1 addition & 1 deletion engines/pink/objects/inventory.cpp
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion engines/pink/objects/sequences/sequencer.cpp
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion engines/pink/objects/side_effect.cpp
Expand Up @@ -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() {
Expand Down

0 comments on commit 85e0c7c

Please sign in to comment.