diff options
Diffstat (limited to 'engines/pink/objects/pages')
-rw-r--r-- | engines/pink/objects/pages/game_page.cpp | 8 | ||||
-rw-r--r-- | engines/pink/objects/pages/game_page.h | 2 | ||||
-rw-r--r-- | engines/pink/objects/pages/page.h | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp index 83df359b80..8e534443d5 100644 --- a/engines/pink/objects/pages/game_page.cpp +++ b/engines/pink/objects/pages/game_page.cpp @@ -32,8 +32,7 @@ namespace Pink { GamePage::GamePage() : _cursorMgr(nullptr), _walkMgr(nullptr), _sequencer(nullptr), - _isLoaded(false), _memFile(nullptr) -{} + _isLoaded(false), _memFile(nullptr) {} GamePage::~GamePage() { clear(); @@ -87,16 +86,15 @@ void GamePage::init(bool isLoadingSave) { } bool isHandler = false; - if (!isLoadingSave) { + if (!isLoadingSave) isHandler = initHandler(); - } _leadActor->start(isHandler); } bool GamePage::initHandler() { for (uint i = 0; i < _handlers.size(); ++i) { - if (_handlers[i]->isSuitable(_leadActor)){ + if (_handlers[i]->isSuitable(_leadActor)) { _handlers[i]->handle(_leadActor); return true; } diff --git a/engines/pink/objects/pages/game_page.h b/engines/pink/objects/pages/game_page.h index 1bae58d768..1c7e5cf217 100644 --- a/engines/pink/objects/pages/game_page.h +++ b/engines/pink/objects/pages/game_page.h @@ -67,7 +67,7 @@ private: CursorMgr *_cursorMgr; WalkMgr *_walkMgr; Sequencer *_sequencer; - Array<HandlerStartPage*> _handlers; + Array<HandlerStartPage *> _handlers; Common::StringMap _variables; }; diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h index 3b5708f530..f8b582a52f 100644 --- a/engines/pink/objects/pages/page.h +++ b/engines/pink/objects/pages/page.h @@ -51,7 +51,7 @@ public: protected: void init(); - Array<Actor*> _actors; + Array<Actor *> _actors; ResourceMgr _resMgr; LeadActor *_leadActor; }; |