diff options
| -rw-r--r-- | engines/pink/objects/actions/action_cel.cpp | 9 | ||||
| -rw-r--r-- | engines/pink/objects/actions/action_cel.h | 2 | ||||
| -rw-r--r-- | engines/pink/objects/pages/pda_page.cpp | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/engines/pink/objects/actions/action_cel.cpp b/engines/pink/objects/actions/action_cel.cpp index f31db4cbc9..600eb88e27 100644 --- a/engines/pink/objects/actions/action_cel.cpp +++ b/engines/pink/objects/actions/action_cel.cpp @@ -64,9 +64,7 @@ void ActionCEL::start() { } void ActionCEL::end() { - if (!_decoder.isVideoLoaded()) - return; - closeDecoder(); + _actor->getPage()->getGame()->getDirector()->removeSprite(this); } void ActionCEL::pause(bool paused) { @@ -88,11 +86,6 @@ void ActionCEL::loadDecoder() { _decoder.loadStream(_actor->getPage()->getResourceStream(_fileName)); } -void ActionCEL::closeDecoder() { - _actor->getPage()->getGame()->getDirector()->removeSprite(this); - _decoder.close(); -} - void ActionCEL::setFrame(uint frame) { _decoder.rewind(); diff --git a/engines/pink/objects/actions/action_cel.h b/engines/pink/objects/actions/action_cel.h index b1fa1b6235..07e16e7c03 100644 --- a/engines/pink/objects/actions/action_cel.h +++ b/engines/pink/objects/actions/action_cel.h @@ -59,8 +59,6 @@ public: protected: virtual void onStart() = 0; - void closeDecoder(); - void setFrame(uint frame); void decodeNext(); diff --git a/engines/pink/objects/pages/pda_page.cpp b/engines/pink/objects/pages/pda_page.cpp index d60b4d013a..e8d4ae94f5 100644 --- a/engines/pink/objects/pages/pda_page.cpp +++ b/engines/pink/objects/pages/pda_page.cpp @@ -39,6 +39,7 @@ Array<Actor *> PDAPage::takeActors() { _actors[i]->preloadSprites(); } Array<Actor *> actorsCopy = _actors; + _actors.clear(); return actorsCopy; } |