PINK: implemented SideEffectModuleVariable fully

scummvm · Jun 28, 2018 · 7c4bcc0 · 7c4bcc0
1 parent d303144
commit 7c4bcc0
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 5 deletions.
diff --git a/engines/pink/actors/actor.cpp b/engines/pink/actors/actor.cpp
@@ -47,4 +47,8 @@ Action *Actor::findAction(Common::String &name) {
     });;
 }
 
+GamePage *Actor::getPage() const {
+    return _page;
+}
+
 } // End of namespace Pink
diff --git a/engines/pink/actors/actor.h b/engines/pink/actors/actor.h
@@ -40,6 +40,7 @@ class Actor : public NamedObject {
     Action *findAction(Common::String &name);
 
     Sequencer *getSequencer();
+    GamePage *getPage() const;
 
 protected:
     GamePage *_page;

diff --git a/engines/pink/actors/lead_actor.h b/engines/pink/actors/lead_actor.h
@@ -34,7 +34,8 @@ class Sequencer;
 class LeadActor : public Actor {
 public:
     virtual void deserialize(Archive &archive);
-    void setNextExecutors(Common::String &nextModule, Common::String &nextPage);
+    void setNextExecutors (Common::String &nextModule, Common::String &nextPage);
+
 private:
     CursorMgr *_cursorMgr;
     WalkMgr *_walkMgr;

diff --git a/engines/pink/module.cpp b/engines/pink/module.cpp
@@ -95,6 +95,10 @@ PinkEngine *Module::getGame() const {
     return _game;
 }
 
+Common::StringMap &Module::getMap() {
+    return _map;
+}
+
 } // End of namespace Pink
 
 

diff --git a/engines/pink/module.h b/engines/pink/module.h
@@ -52,12 +52,13 @@ class Module : public NamedObject {
     void OnMouseMove();
     void OnKeyboardButtonClick();
 
-private:
-    PinkEngine *_game;
-public:
+    Common::StringMap &getMap();
+
     PinkEngine *getGame() const;
 
+
 private:
+    PinkEngine *_game;
     GamePage *_page;
     PagesArray _pages;
     InventoryMgr _invMgr;

diff --git a/engines/pink/page.cpp b/engines/pink/page.cpp
@@ -108,4 +108,8 @@ Sequencer *GamePage::getSequencer() {
     return _sequencer;
 }
 
+Module *GamePage::getModule() const {
+    return _module;
+}
+
 } // End of namespace Pink
diff --git a/engines/pink/page.h b/engines/pink/page.h
@@ -67,10 +67,13 @@ class GamePage : public Page  {
 
     PinkEngine *getGame();
     Sequencer *getSequencer();
+    Module *getModule() const;
 
 private:
     int perhapsIsLoaded;
     Module *_module;
+
+private:
     CursorMgr *_cursorMgr;
     WalkMgr *_walkMgr;
     Sequencer *_sequencer;

diff --git a/engines/pink/side_effects/side_effect.h b/engines/pink/side_effects/side_effect.h
@@ -32,7 +32,7 @@ class LeadActor;
 class SideEffect : public Object {
 public:
     virtual ~SideEffect() {};
-    virtual void init(LeadActor *_actor) {};
+    virtual void init(LeadActor *actor) {};
 
 };
 

diff --git a/engines/pink/side_effects/side_effect_module_variable.cpp b/engines/pink/side_effects/side_effect_module_variable.cpp
@@ -25,6 +25,8 @@
  */
 
 #include "side_effect_module_variable.h"
+#include "../actors/lead_actor.h"
+#include "../page.h"
 
 namespace Pink {
 
@@ -34,4 +36,9 @@ void SideEffectModuleVariable::deserialize(Archive &archive) {
           _name.c_str(), _value.c_str());
 }
 
+void SideEffectModuleVariable::init(LeadActor *actor) {
+    Common::StringMap &moduleMap = actor->getPage()->getModule()->getMap();
+    moduleMap[_name] = _value;
+}
+
 }
diff --git a/engines/pink/side_effects/side_effect_module_variable.h b/engines/pink/side_effects/side_effect_module_variable.h
@@ -30,6 +30,7 @@ class SideEffectModuleVariable : public SideEffectVariable {
 public:
     virtual void deserialize(Archive &archive);
 
+    virtual void init(LeadActor *actor);
 };
 
 } // End of namespace Pink