diff options
author | whiterandrek | 2018-05-22 07:01:54 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | ea5c09341013805e3be3a40d96a54baa7548b5d0 (patch) | |
tree | 2bea7dd9f013166030c5f418a5ef9361a7cce131 /engines/pink/objects | |
parent | c06452594f13c93fe2d21f61e04a99d430ced65b (diff) | |
download | scummvm-rg350-ea5c09341013805e3be3a40d96a54baa7548b5d0.tar.gz scummvm-rg350-ea5c09341013805e3be3a40d96a54baa7548b5d0.tar.bz2 scummvm-rg350-ea5c09341013805e3be3a40d96a54baa7548b5d0.zip |
PINK: remove lambda functions
PINK: remove lambda functions
PINK: remove >> << operators
Diffstat (limited to 'engines/pink/objects')
-rw-r--r-- | engines/pink/objects/module.cpp | 9 | ||||
-rw-r--r-- | engines/pink/objects/sequences/sequencer.cpp | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp index 9ad536530c..019f71ba30 100644 --- a/engines/pink/objects/module.cpp +++ b/engines/pink/objects/module.cpp @@ -76,10 +76,11 @@ void Module::changePage(const Common::String &pageName) { } GamePage *Module::findPage(const Common::String &pageName) const { - return *Common::find_if(_pages.begin(), _pages.end(), [&pageName] - (GamePage* page) { - return pageName == page->getName(); - }); + for (uint i = 0; i < _pages.size(); ++i) { + if (_pages[i]->getName() == pageName) + return _pages[i]; + } + return nullptr; } PinkEngine *Module::getGame() const { diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp index 37cd03cd37..5644aa8f25 100644 --- a/engines/pink/objects/sequences/sequencer.cpp +++ b/engines/pink/objects/sequences/sequencer.cpp @@ -49,10 +49,11 @@ void Sequencer::deserialize(Archive &archive) { } Sequence *Sequencer::findSequence(const Common::String &name) { - return *Common::find_if(_sequences.begin(), _sequences.end(), [&name] - (Sequence* sequence) { - return name == sequence->getName(); - }); + for (uint i = 0; i < _sequences.size(); ++i) { + if (_sequences[i]->getName() == name) + return _sequences[i]; + } + return nullptr; } void Sequencer::authorSequence(Sequence *sequence, bool unk) { |