diff options
47 files changed, 41 insertions, 55 deletions
diff --git a/engines/pink/archive.cpp b/engines/pink/archive.cpp index 6b442ae630..a3c968b4dd 100644 --- a/engines/pink/archive.cpp +++ b/engines/pink/archive.cpp @@ -344,5 +344,3 @@ void Archive::writeString(const Common::String &string) { } } // End of namespace Pink - - diff --git a/engines/pink/cel_decoder.cpp b/engines/pink/cel_decoder.cpp index ad0a7ac7da..044a8d00b2 100644 --- a/engines/pink/cel_decoder.cpp +++ b/engines/pink/cel_decoder.cpp @@ -249,4 +249,4 @@ void CelDecoder::CelVideoTrack::setY(int32 y) { _center.y = y;//+ getHeight() / 2; } -} // End of namepsace Pink
\ No newline at end of file +} // End of namepsace Pink diff --git a/engines/pink/cursor_mgr.cpp b/engines/pink/cursor_mgr.cpp index b42ef745c5..867a0f38a7 100644 --- a/engines/pink/cursor_mgr.cpp +++ b/engines/pink/cursor_mgr.cpp @@ -118,4 +118,4 @@ void CursorMgr::startAnimation(int index) { } } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp index c504194daa..10c3e1d86b 100644 --- a/engines/pink/director.cpp +++ b/engines/pink/director.cpp @@ -138,4 +138,4 @@ Actor *Director::getActorByPoint(Common::Point point) { return nullptr; } -}
\ No newline at end of file +} diff --git a/engines/pink/file.cpp b/engines/pink/file.cpp index 2f2bc69e8e..72de8ebdea 100644 --- a/engines/pink/file.cpp +++ b/engines/pink/file.cpp @@ -154,4 +154,4 @@ void ResourceDescription::load(Common::File &file) { inBro = (bool) file.readUint16LE(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/action_cel.cpp b/engines/pink/objects/actions/action_cel.cpp index 1b33fd737e..352c635d68 100644 --- a/engines/pink/objects/actions/action_cel.cpp +++ b/engines/pink/objects/actions/action_cel.cpp @@ -92,4 +92,4 @@ void ActionCEL::unpause() { _decoder->pauseVideo(0); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/action_hide.cpp b/engines/pink/objects/actions/action_hide.cpp index 6678d937a9..a8a9a3a0b7 100644 --- a/engines/pink/objects/actions/action_hide.cpp +++ b/engines/pink/objects/actions/action_hide.cpp @@ -45,4 +45,4 @@ void ActionHide::toConsole() { ActionHide::~ActionHide() {} -} //End of namespace Pink
\ No newline at end of file +} //End of namespace Pink diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp index 03c04f9dee..77a17630e2 100644 --- a/engines/pink/objects/actions/action_loop.cpp +++ b/engines/pink/objects/actions/action_loop.cpp @@ -66,4 +66,4 @@ void ActionLoop::onStart() { _actor->endAction(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp index f54d81c66e..e6f557051f 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.cpp +++ b/engines/pink/objects/actions/action_play_with_sfx.cpp @@ -115,4 +115,4 @@ void ActionSfx::end() { _sound = nullptr; } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/action_sound.cpp b/engines/pink/objects/actions/action_sound.cpp index 196ae61076..45d74be23a 100644 --- a/engines/pink/objects/actions/action_sound.cpp +++ b/engines/pink/objects/actions/action_sound.cpp @@ -96,4 +96,4 @@ void ActionSound::unpause() { _sound->resume(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/action_still.cpp b/engines/pink/objects/actions/action_still.cpp index 6afa2df5aa..c72e6347b4 100644 --- a/engines/pink/objects/actions/action_still.cpp +++ b/engines/pink/objects/actions/action_still.cpp @@ -54,4 +54,4 @@ void ActionStill::onStart() { _actor->endAction(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/action_talk.cpp b/engines/pink/objects/actions/action_talk.cpp index ab15aedfa4..fad3f19ff9 100644 --- a/engines/pink/objects/actions/action_talk.cpp +++ b/engines/pink/objects/actions/action_talk.cpp @@ -72,4 +72,4 @@ void ActionTalk::unpause() { _sound->resume(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp index 27bcafec47..12e2809d21 100644 --- a/engines/pink/objects/actions/action_text.cpp +++ b/engines/pink/objects/actions/action_text.cpp @@ -43,4 +43,4 @@ void ActionText::toConsole() { _name.c_str(), _text.c_str(), _bounds[0], _bounds[1], _bounds[2], _bounds[3], _centered, _scrollBar, _textColor, _backgroundColor); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actions/walk_action.cpp b/engines/pink/objects/actions/walk_action.cpp index 42ce90e76c..d05e94eadb 100644 --- a/engines/pink/objects/actions/walk_action.cpp +++ b/engines/pink/objects/actions/walk_action.cpp @@ -41,4 +41,4 @@ void WalkAction::onStart() { _decoder->start(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp index c8079375ab..4853f8d2ff 100644 --- a/engines/pink/objects/actors/actor.cpp +++ b/engines/pink/objects/actors/actor.cpp @@ -99,12 +99,14 @@ void Actor::setAction(Action *newAction) { } void Actor::setAction(Action *newAction, bool unk) { - if (unk){ + if (unk) { assert(0); // want to see this _isActionEnded = 1; _action = newAction; } - else setAction(newAction); + else { + setAction(newAction); + } } Action *Actor::getAction() const { diff --git a/engines/pink/objects/actors/pda_button_actor.cpp b/engines/pink/objects/actors/pda_button_actor.cpp index d1bd63cee1..1057a060e4 100644 --- a/engines/pink/objects/actors/pda_button_actor.cpp +++ b/engines/pink/objects/actors/pda_button_actor.cpp @@ -39,4 +39,4 @@ void PDAButtonActor::toConsole() { _name.c_str(), _x, _y, _hideOnStop, _opaque, (int) _command); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/actors/pda_button_actor.h b/engines/pink/objects/actors/pda_button_actor.h index b3a6d20e63..c3cd845886 100644 --- a/engines/pink/objects/actors/pda_button_actor.h +++ b/engines/pink/objects/actors/pda_button_actor.h @@ -44,6 +44,6 @@ private: Command _command; }; -} +} // End of namespace Pink #endif diff --git a/engines/pink/objects/actors/supporting_actor.cpp b/engines/pink/objects/actors/supporting_actor.cpp index 04fbb8b18f..9c06dee3fc 100644 --- a/engines/pink/objects/actors/supporting_actor.cpp +++ b/engines/pink/objects/actors/supporting_actor.cpp @@ -90,4 +90,4 @@ void SupportingActor::onHover(Common::Point point, const Common::String &itemNam Actor::onHover(point, item, cursorMgr); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/condition.cpp b/engines/pink/objects/condition.cpp index be127305a0..4e0b3760b8 100644 --- a/engines/pink/objects/condition.cpp +++ b/engines/pink/objects/condition.cpp @@ -97,4 +97,3 @@ void ConditionNotInventoryItemOwner::toConsole() { } } // End of namespace Pink - diff --git a/engines/pink/objects/condition.h b/engines/pink/objects/condition.h index 4b48d83e7d..505ed2d58d 100644 --- a/engines/pink/objects/condition.h +++ b/engines/pink/objects/condition.h @@ -102,5 +102,4 @@ public: } // End of namespace Pink - #endif diff --git a/engines/pink/objects/handlers/handler_mgr.cpp b/engines/pink/objects/handlers/handler_mgr.cpp index 2c5230eaeb..695030f5d2 100644 --- a/engines/pink/objects/handlers/handler_mgr.cpp +++ b/engines/pink/objects/handlers/handler_mgr.cpp @@ -131,4 +131,4 @@ HandlerMgr::~HandlerMgr() { } } -} +} // End of namespace Pink diff --git a/engines/pink/objects/handlers/handler_timer.cpp b/engines/pink/objects/handlers/handler_timer.cpp index 469b6f9a69..d9f75f67b9 100644 --- a/engines/pink/objects/handlers/handler_timer.cpp +++ b/engines/pink/objects/handlers/handler_timer.cpp @@ -108,4 +108,4 @@ void HandlerTimerSequences::handle(Actor *actor) { assert(sequence); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/handlers/handler_timer.h b/engines/pink/objects/handlers/handler_timer.h index b0fb4bc453..cbe6824d2a 100644 --- a/engines/pink/objects/handlers/handler_timer.h +++ b/engines/pink/objects/handlers/handler_timer.h @@ -60,5 +60,4 @@ protected: } // End of namespace Pink - #endif diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp index 4280cd5a48..a7a483f24d 100644 --- a/engines/pink/objects/inventory.cpp +++ b/engines/pink/objects/inventory.cpp @@ -201,5 +201,3 @@ InventoryItem *InventoryMgr::getCurrentItem() { } } // End of namespace Pink - - diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp index 6f9fab06dc..9ad536530c 100644 --- a/engines/pink/objects/module.cpp +++ b/engines/pink/objects/module.cpp @@ -101,6 +101,3 @@ InventoryMgr *Module::getInventoryMgr() { } } // End of namespace Pink - - - diff --git a/engines/pink/objects/object.cpp b/engines/pink/objects/object.cpp index 796b356a6c..6e5005372e 100644 --- a/engines/pink/objects/object.cpp +++ b/engines/pink/objects/object.cpp @@ -43,4 +43,3 @@ void NamedObject::store(Archive &archive) { } } // End of namespace Pink - diff --git a/engines/pink/objects/object.h b/engines/pink/objects/object.h index f2301df98a..88ce35b3b7 100644 --- a/engines/pink/objects/object.h +++ b/engines/pink/objects/object.h @@ -55,4 +55,4 @@ protected: } // End of namespace Pink -#endif
\ No newline at end of file +#endif diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp index ca9f304225..952ea42b1f 100644 --- a/engines/pink/objects/pages/game_page.cpp +++ b/engines/pink/objects/pages/game_page.cpp @@ -213,5 +213,4 @@ void GamePage::clear() { delete _walkMgr; _walkMgr = nullptr; } - -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/pages/game_page.h b/engines/pink/objects/pages/game_page.h index 37584ee3fb..5aad7ac66f 100644 --- a/engines/pink/objects/pages/game_page.h +++ b/engines/pink/objects/pages/game_page.h @@ -73,4 +73,4 @@ private: } -#endif //SCUMMVM_GAME_PAGE_H +#endif diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp index 3c46d19b0f..4b2f5f1d49 100644 --- a/engines/pink/objects/pages/page.cpp +++ b/engines/pink/objects/pages/page.cpp @@ -95,5 +95,4 @@ void Page::unpause() { } } - } // End of namespace Pink diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h index 2d1990c76f..1d96a93b5a 100644 --- a/engines/pink/objects/pages/page.h +++ b/engines/pink/objects/pages/page.h @@ -58,4 +58,4 @@ protected: } // End of namespace Pink -#endif
\ No newline at end of file +#endif diff --git a/engines/pink/objects/sequences/seq_timer.cpp b/engines/pink/objects/sequences/seq_timer.cpp index e661308c56..974056a956 100644 --- a/engines/pink/objects/sequences/seq_timer.cpp +++ b/engines/pink/objects/sequences/seq_timer.cpp @@ -58,6 +58,4 @@ void SeqTimer::update() { } } - - -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/sequences/sequence.cpp b/engines/pink/objects/sequences/sequence.cpp index 4cd041b087..1e08bb5c02 100644 --- a/engines/pink/objects/sequences/sequence.cpp +++ b/engines/pink/objects/sequences/sequence.cpp @@ -188,4 +188,4 @@ void SequenceAudio::skipToLastSubSequence() { end(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/sequences/sequence_context.cpp b/engines/pink/objects/sequences/sequence_context.cpp index 4aec5fe4c5..8ce85b7273 100644 --- a/engines/pink/objects/sequences/sequence_context.cpp +++ b/engines/pink/objects/sequences/sequence_context.cpp @@ -90,4 +90,4 @@ void SequenceContext::setNextItemIndex(int index) { _nextItemIndex = index; } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/sequences/sequence_item.cpp b/engines/pink/objects/sequences/sequence_item.cpp index 07c708baf5..a530390f97 100644 --- a/engines/pink/objects/sequences/sequence_item.cpp +++ b/engines/pink/objects/sequences/sequence_item.cpp @@ -107,4 +107,4 @@ void SequenceItemDefaultAction::skip(Sequence *sequence) { execute(0, sequence, 1); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp index 852011cce7..37cd03cd37 100644 --- a/engines/pink/objects/sequences/sequencer.cpp +++ b/engines/pink/objects/sequences/sequencer.cpp @@ -127,4 +127,4 @@ SequenceActorState *Sequencer::findSequenceActorState(const Common::String &name return nullptr; } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/sequences/sequencer.h b/engines/pink/objects/sequences/sequencer.h index a48439768b..0213728bac 100644 --- a/engines/pink/objects/sequences/sequencer.h +++ b/engines/pink/objects/sequences/sequencer.h @@ -69,4 +69,4 @@ public: } // End of namespace Pink -#endif
\ No newline at end of file +#endif diff --git a/engines/pink/objects/side_effect.cpp b/engines/pink/objects/side_effect.cpp index 79d1c7fb2f..228b8d5dc8 100644 --- a/engines/pink/objects/side_effect.cpp +++ b/engines/pink/objects/side_effect.cpp @@ -128,4 +128,4 @@ void SideEffectRandomPageVariable::toConsole() { debug("\t\tSideEffectRandomPageVariable: _name=%s, _values=%s", _name.c_str(), values.c_str()); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/walk/walk_location.cpp b/engines/pink/objects/walk/walk_location.cpp index e3998daeb5..ec2dbc9be9 100644 --- a/engines/pink/objects/walk/walk_location.cpp +++ b/engines/pink/objects/walk/walk_location.cpp @@ -40,4 +40,4 @@ void WalkLocation::toConsole() { } } -} // End of namespace Pink;
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/walk/walk_location.h b/engines/pink/objects/walk/walk_location.h index b9b2a0abae..ef1cbab192 100644 --- a/engines/pink/objects/walk/walk_location.h +++ b/engines/pink/objects/walk/walk_location.h @@ -38,4 +38,4 @@ private: } // End of namespace Pink -#endif
\ No newline at end of file +#endif diff --git a/engines/pink/objects/walk/walk_mgr.cpp b/engines/pink/objects/walk/walk_mgr.cpp index 4c0b120918..989f69e4af 100644 --- a/engines/pink/objects/walk/walk_mgr.cpp +++ b/engines/pink/objects/walk/walk_mgr.cpp @@ -149,4 +149,4 @@ void WalkMgr::end() { _leadActor->onWalkEnd(); } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/walk/walk_shortest_path.cpp b/engines/pink/objects/walk/walk_shortest_path.cpp index aa74f0e3b3..26253235bd 100644 --- a/engines/pink/objects/walk/walk_shortest_path.cpp +++ b/engines/pink/objects/walk/walk_shortest_path.cpp @@ -157,4 +157,4 @@ void WalkShortestPath::remove(WalkLocation *location) { } } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/objects/walk/walk_shortest_path.h b/engines/pink/objects/walk/walk_shortest_path.h index 3b9734f35d..deb7770061 100644 --- a/engines/pink/objects/walk/walk_shortest_path.h +++ b/engines/pink/objects/walk/walk_shortest_path.h @@ -57,5 +57,4 @@ private: } // End of namespace Pink - #endif diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp index ee564dc1c6..f2b18aa18d 100644 --- a/engines/pink/pink.cpp +++ b/engines/pink/pink.cpp @@ -246,4 +246,4 @@ void PinkEngine::setCursor(uint cursorIndex) { cursor->getHotspotX(), cursor->getHotspotY(), cursor->getKeyColor()); } -}
\ No newline at end of file +} diff --git a/engines/pink/pink.h b/engines/pink/pink.h index e77ba7274f..710f590d34 100644 --- a/engines/pink/pink.h +++ b/engines/pink/pink.h @@ -132,4 +132,4 @@ private: } // End of namespace Pink -#endif
\ No newline at end of file +#endif diff --git a/engines/pink/sound.cpp b/engines/pink/sound.cpp index 6fbd5fc0c0..b4b8f2a2e8 100644 --- a/engines/pink/sound.cpp +++ b/engines/pink/sound.cpp @@ -81,4 +81,4 @@ uint32 Sound::getCurrentSample() { return _mixer->getSoundElapsedTime(_handle) * kSampleRate / 1000; } -} // End of namespace Pink
\ No newline at end of file +} // End of namespace Pink diff --git a/engines/pink/utils.h b/engines/pink/utils.h index 77efdb94b9..d5ef9a4c77 100644 --- a/engines/pink/utils.h +++ b/engines/pink/utils.h @@ -52,4 +52,4 @@ public: } // End of namespace Pink -#endif
\ No newline at end of file +#endif |