PINK: fixed various PDA bugs

4 files changed, 3 insertions, 12 deletions

diff --git a/engines/pink/objects/actions/action_cel.cpp b/engines/pink/objects/actions/action_cel.cpp
index 600eb88e27..5abc9787b9 100644
--- a/engines/pink/objects/actions/action_cel.cpp
+++ b/engines/pink/objects/actions/action_cel.cpp
@@ -65,6 +65,7 @@ void ActionCEL::start() {
 
 void ActionCEL::end() {
 	_actor->getPage()->getGame()->getDirector()->removeSprite(this);
+	_decoder.close();
 }
 
 void ActionCEL::pause(bool paused) {
diff --git a/engines/pink/objects/actions/action_cel.h b/engines/pink/objects/actions/action_cel.h
index 07e16e7c03..2a88350458 100644
--- a/engines/pink/objects/actions/action_cel.h
+++ b/engines/pink/objects/actions/action_cel.h
@@ -38,8 +38,6 @@ public:
 
 	bool initPalette(Director *director) override;
 
-	void loadDecoder();
-
 	void start() override;
 	void end() override;
 
@@ -62,6 +60,8 @@ protected:
 	void setFrame(uint frame);
 	void decodeNext();
 
+	void loadDecoder();
+
 	CelDecoder _decoder;
 	Common::String _fileName;
 	Common::Rect _bounds;
diff --git a/engines/pink/objects/pages/pda_page.cpp b/engines/pink/objects/pages/pda_page.cpp
index e8d4ae94f5..ac69c38cb2 100644
--- a/engines/pink/objects/pages/pda_page.cpp
+++ b/engines/pink/objects/pages/pda_page.cpp
@@ -34,13 +34,4 @@ PDAPage PDAPage::create(const Common::String &pageName, PDAMgr &pdaMgr) {
 	return page;
 }
 
-Array<Actor *> PDAPage::takeActors() {
-	for (uint i = 0; i < _actors.size(); ++i) {
-		_actors[i]->preloadSprites();
-	}
-	Array<Actor *> actorsCopy = _actors;
-	_actors.clear();
-	return actorsCopy;
-}
-
 } // End of namespace Pink
diff --git a/engines/pink/objects/pages/pda_page.h b/engines/pink/objects/pages/pda_page.h
index 79da57c985..76cc05810e 100644
--- a/engines/pink/objects/pages/pda_page.h
+++ b/engines/pink/objects/pages/pda_page.h
@@ -32,7 +32,6 @@ class PDAMgr;
 class PDAPage : public Page {
 public:
 	static PDAPage create(const Common::String &pageName, PDAMgr &pdaMgr);
-	Array<Actor *> takeActors();
 
 private:
 	PDAPage(const Common::String &name) { _name = name; }