diff options
Diffstat (limited to 'engines/pink/objects')
-rw-r--r-- | engines/pink/objects/handlers/handler.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/module.cpp | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/engines/pink/objects/handlers/handler.cpp b/engines/pink/objects/handlers/handler.cpp index 0e9261695c..a848cfd98e 100644 --- a/engines/pink/objects/handlers/handler.cpp +++ b/engines/pink/objects/handlers/handler.cpp @@ -65,7 +65,7 @@ void HandlerSequences::onMessage(LeadActor *actor) { Handler::onMessage(actor); Sequencer *sequencer = actor->getSequencer(); - assert(_sequences.size()); + assert(!_sequences.empty()); Common::RandomSource &rnd = actor->getPage()->getGame()->getRnd(); uint index = rnd.getRandomNumber(_sequences.size() - 1); diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp index f78f290abe..a8166dee43 100644 --- a/engines/pink/objects/module.cpp +++ b/engines/pink/objects/module.cpp @@ -50,11 +50,9 @@ void Module::init(bool isLoadingSave, const Common::String &pageName) { // 0 0 - new game // 0 1 - module changed // 1 0 - from save - if (!pageName.empty()) { + if (!pageName.empty()) _page = findPage(pageName); - } - - if (!_page) + else if (!_page) _page = _pages[0]; _page->init(isLoadingSave); @@ -67,7 +65,6 @@ void Module::changePage(const Common::String &pageName) { //_page->clear - page->init(kLoadingNewGame); } @@ -78,7 +75,6 @@ GamePage *Module::findPage(const Common::String &pageName) const { }); } - PinkEngine *Module::getGame() const { return _game; } |