PINK: implemented page state saving

6 files changed, 16 insertions, 4 deletions

diff --git a/engines/pink/objects/actions/action_cel.cpp b/engines/pink/objects/actions/action_cel.cpp
index 938d117015..e9e524726c 100644
--- a/engines/pink/objects/actions/action_cel.cpp
+++ b/engines/pink/objects/actions/action_cel.cpp
@@ -79,4 +79,8 @@ void ActionCEL::update() {
     }
 }
 
+ActionCEL::~ActionCEL() {
+    delete _decoder;
+}
+
 } // End of namespace Pink
\ No newline at end of file
diff --git a/engines/pink/objects/actions/action_cel.h b/engines/pink/objects/actions/action_cel.h
index 43fe8476e0..2ae5308d0e 100644
--- a/engines/pink/objects/actions/action_cel.h
+++ b/engines/pink/objects/actions/action_cel.h
@@ -32,6 +32,8 @@ class CelDecoder;
 
 class ActionCEL : public Action {
 public:
+    ~ActionCEL() override;
+
     ActionCEL();
     virtual void deserialize(Archive &archive);
     virtual void start(bool unk);
diff --git a/engines/pink/objects/actions/action_hide.cpp b/engines/pink/objects/actions/action_hide.cpp
index b89d4c9627..ed2c903f1d 100644
--- a/engines/pink/objects/actions/action_hide.cpp
+++ b/engines/pink/objects/actions/action_hide.cpp
@@ -23,7 +23,6 @@
 #include "action_hide.h"
 #include "engines/pink/objects/actors/actor.h"
 #include <engines/pink/archive.h>
-#include <common/debug.h>
 
 
 namespace Pink {
@@ -45,4 +44,6 @@ void ActionHide::toConsole() {
     debug("\tActionHide: _name = %s", _name.c_str());
 }
 
+ActionHide::~ActionHide() {}
+
 } //End of namespace Pink
\ No newline at end of file
diff --git a/engines/pink/objects/actions/action_hide.h b/engines/pink/objects/actions/action_hide.h
index 414d077409..bc62a5fc5f 100644
--- a/engines/pink/objects/actions/action_hide.h
+++ b/engines/pink/objects/actions/action_hide.h
@@ -29,6 +29,8 @@ namespace Pink {
 
 class ActionHide : public Action {
 public:
+    ~ActionHide() override;
+
     virtual void deserialize(Archive &archive);
     virtual void toConsole();
 
diff --git a/engines/pink/objects/actions/action_play.cpp b/engines/pink/objects/actions/action_play.cpp
index 969eacf035..d3ded9a45a 100644
--- a/engines/pink/objects/actions/action_play.cpp
+++ b/engines/pink/objects/actions/action_play.cpp
@@ -45,10 +45,13 @@ void ActionPlay::end() {
 
 void ActionPlay::onStart() {
     debug("Actor %s has now ActionPlay %s", _actor->getName().c_str(), _name.c_str());
-    _decoder->seekToFrame(_startFrame);
+    _decoder->start();
+    for (int i = 0; i <= _startFrame; ++i) {
+        _decoder->decodeNextFrame();
+    }
+
     if (_stopFrame != -1)
         _decoder->setEndFrame(_stopFrame);
-    _decoder->start();
 }
 
 } // End of namespace Pink
diff --git a/engines/pink/objects/actions/action_still.cpp b/engines/pink/objects/actions/action_still.cpp
index 0af57a0fee..fc835f1af5 100644
--- a/engines/pink/objects/actions/action_still.cpp
+++ b/engines/pink/objects/actions/action_still.cpp
@@ -45,7 +45,7 @@ void ActionStill::end() {
 
 void ActionStill::onStart() {
     debug("Actor %s has now ActionStill %s", _actor->getName().c_str(), _name.c_str());
-    for (int i = 0; i < _startFrame; ++i) {
+    for (int i = 0; i <= _startFrame; ++i) {
         _decoder->decodeNextFrame();
     }
     _decoder->stop();