PINK: implemented init of LeadActor and checking for state in LeadAct…

…or method
scummvm · Jun 28, 2018 · ac0ed1d · ac0ed1d
1 parent 2e3e07b
commit ac0ed1d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/engines/pink/actors/actor.h b/engines/pink/actors/actor.h
@@ -43,7 +43,7 @@ class Actor : public NamedObject {
     Sequencer *getSequencer();
     GamePage *getPage() const;
 
-    void init(bool unk);
+    virtual void init(bool unk);
     void hide();
     void endAction();
 

diff --git a/engines/pink/actors/lead_actor.cpp b/engines/pink/actors/lead_actor.cpp
@@ -38,8 +38,18 @@ void LeadActor::deserialize(Archive &archive) {
 }
 
 void LeadActor::setNextExecutors(Common::String &nextModule, Common::String &nextPage) {
-    //TODO check for lead actor state
-    _page->getGame()->setNextExecutors(nextModule, nextPage);
+    if (_state == Ready || _state == Moving || _state == inDialog1 || _state == Inventory || _state == PDA) {
+        _state = PlayingVideo;
+        _page->getGame()->setNextExecutors(nextModule, nextPage);
+    }
+}
+
+void LeadActor::init(bool unk) {
+    if (_state == unk_Loading){
+        _state = Ready;
+    }
+    //TODO set actor ref to inv mgr
+    Actor::init(unk);
 }
 
 } // End of namespace Pink
diff --git a/engines/pink/actors/lead_actor.h b/engines/pink/actors/lead_actor.h
@@ -47,7 +47,10 @@ class LeadActor : public Actor {
     virtual void deserialize(Archive &archive);
     void setNextExecutors (Common::String &nextModule, Common::String &nextPage);
 
+    virtual void init(bool unk);
+
 private:
+    State _state;
     CursorMgr *_cursorMgr;
     WalkMgr *_walkMgr;
     Sequencer *_sequencer;