diff options
Diffstat (limited to 'engines/pink')
-rw-r--r-- | engines/pink/actions/action_hide.cpp | 9 | ||||
-rw-r--r-- | engines/pink/actions/action_hide.h | 3 | ||||
-rw-r--r-- | engines/pink/actions/action_still.cpp | 6 | ||||
-rw-r--r-- | engines/pink/items/sequence_item.cpp | 1 | ||||
-rw-r--r-- | engines/pink/items/sequence_item.h | 2 | ||||
-rw-r--r-- | engines/pink/items/sequence_item_default_action.cpp | 10 | ||||
-rw-r--r-- | engines/pink/items/sequence_item_default_action.h | 3 | ||||
-rw-r--r-- | engines/pink/items/sequence_item_leader.cpp | 10 | ||||
-rw-r--r-- | engines/pink/items/sequence_item_leader.h | 1 | ||||
-rw-r--r-- | engines/pink/page.cpp | 7 | ||||
-rw-r--r-- | engines/pink/pink.cpp | 1 | ||||
-rw-r--r-- | engines/pink/sequences/sequence.cpp | 2 | ||||
-rw-r--r-- | engines/pink/sequences/sequencer.cpp | 2 |
13 files changed, 55 insertions, 2 deletions
diff --git a/engines/pink/actions/action_hide.cpp b/engines/pink/actions/action_hide.cpp index 8c3eb17bef..9c99bc7cfb 100644 --- a/engines/pink/actions/action_hide.cpp +++ b/engines/pink/actions/action_hide.cpp @@ -20,7 +20,16 @@ * */ +#include "action_hide.h" +#include <engines/pink/archive.h> +#include <common/debug.h> + + namespace Pink { +void Pink::ActionHide::deserialize(Archive &archive) { + Action::deserialize(archive); + debug("\tActionHide: _name = %s", _name.c_str()); +} } //End of namespace Pink
\ No newline at end of file diff --git a/engines/pink/actions/action_hide.h b/engines/pink/actions/action_hide.h index 2c2af5c2c6..4662d5f139 100644 --- a/engines/pink/actions/action_hide.h +++ b/engines/pink/actions/action_hide.h @@ -28,7 +28,10 @@ namespace Pink { class ActionHide : public Action { +public: + virtual void deserialize(Archive &archive); +public: }; } //End of namespace Pink diff --git a/engines/pink/actions/action_still.cpp b/engines/pink/actions/action_still.cpp index f015a8b692..b33476a034 100644 --- a/engines/pink/actions/action_still.cpp +++ b/engines/pink/actions/action_still.cpp @@ -20,14 +20,20 @@ * */ +#include <common/debug.h> #include "action_still.h" #include "../archive.h" +#include "action_play.h" namespace Pink { void ActionStill::deserialize(Archive &archive) { ActionCEL::deserialize(archive); archive >> _startFrame; + if (!dynamic_cast<ActionPlay*>(this)){ + debug("\tActionStill: _name = %s, _fileName = %s, _startFrame = %u", + _name.c_str(), _fileName.c_str(), _startFrame); + } } } // End of namespace Pink
\ No newline at end of file diff --git a/engines/pink/items/sequence_item.cpp b/engines/pink/items/sequence_item.cpp index 0672fd9b11..c0213616f3 100644 --- a/engines/pink/items/sequence_item.cpp +++ b/engines/pink/items/sequence_item.cpp @@ -20,6 +20,7 @@ * */ +#include <common/debug.h> #include "sequence_item.h" #include "../archive.h" diff --git a/engines/pink/items/sequence_item.h b/engines/pink/items/sequence_item.h index b81d193df4..76c81b5ab7 100644 --- a/engines/pink/items/sequence_item.h +++ b/engines/pink/items/sequence_item.h @@ -31,7 +31,7 @@ class SequenceItem : public Object { public: virtual void deserialize(Archive &archive); -private: +protected: Common::String _actor; Common::String _action; }; diff --git a/engines/pink/items/sequence_item_default_action.cpp b/engines/pink/items/sequence_item_default_action.cpp index 58d8830ddc..279877a81b 100644 --- a/engines/pink/items/sequence_item_default_action.cpp +++ b/engines/pink/items/sequence_item_default_action.cpp @@ -20,6 +20,16 @@ * */ +#include <engines/pink/archive.h> +#include <common/debug.h> +#include "sequence_item_default_action.h" + namespace Pink { +void Pink::SequenceItemDefaultAction::deserialize(Archive &archive) { + SequenceItem::deserialize(archive); + debug("\t\tSequenceItemDefaultAction: _actor = %s, _action = %s", + _actor.c_str(), _action.c_str()); +} + } // End of namespace Pink
\ No newline at end of file diff --git a/engines/pink/items/sequence_item_default_action.h b/engines/pink/items/sequence_item_default_action.h index 353846409a..99096738b5 100644 --- a/engines/pink/items/sequence_item_default_action.h +++ b/engines/pink/items/sequence_item_default_action.h @@ -28,7 +28,8 @@ namespace Pink { class SequenceItemDefaultAction : public SequenceItem { - +public: + virtual void deserialize(Archive &archive); }; } // End of namespace Pink diff --git a/engines/pink/items/sequence_item_leader.cpp b/engines/pink/items/sequence_item_leader.cpp index 8c3eb17bef..412352a871 100644 --- a/engines/pink/items/sequence_item_leader.cpp +++ b/engines/pink/items/sequence_item_leader.cpp @@ -20,7 +20,17 @@ * */ +#include <engines/pink/archive.h> +#include <common/debug.h> +#include "sequence_item_leader.h" + namespace Pink { +void Pink::SequenceItemLeader::deserialize(Archive &archive) { + SequenceItem::deserialize(archive); + debug("\t\tSequenceItemLeader: _actor = %s, _action = %s", + _actor.c_str(), _action.c_str()); +} + } //End of namespace Pink
\ No newline at end of file diff --git a/engines/pink/items/sequence_item_leader.h b/engines/pink/items/sequence_item_leader.h index 9edfc05b41..b5506ad64d 100644 --- a/engines/pink/items/sequence_item_leader.h +++ b/engines/pink/items/sequence_item_leader.h @@ -29,6 +29,7 @@ namespace Pink { class SequenceItemLeader : public SequenceItem { public: + virtual void deserialize(Archive &archive); private: }; diff --git a/engines/pink/page.cpp b/engines/pink/page.cpp index e802250f17..a1d025f4ff 100644 --- a/engines/pink/page.cpp +++ b/engines/pink/page.cpp @@ -61,6 +61,13 @@ void GamePage::init(bool isLoadingSave) { //assert(perhapsIsLoaded == 0); loadFields(); } + + //init actor which inits actions + + if (!isLoadingSave) { + + } + } void GamePage::loadFields() { diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp index 9f286814d0..950ef23c06 100644 --- a/engines/pink/pink.cpp +++ b/engines/pink/pink.cpp @@ -110,6 +110,7 @@ Common::Error Pink::PinkEngine::run() { } } //update(); + g_system->updateScreen(); g_system->delayMillis(10); } diff --git a/engines/pink/sequences/sequence.cpp b/engines/pink/sequences/sequence.cpp index d3a6872a30..54a293d391 100644 --- a/engines/pink/sequences/sequence.cpp +++ b/engines/pink/sequences/sequence.cpp @@ -20,6 +20,7 @@ * */ +#include <common/debug.h> #include "sequence.h" #include "sequencer.h" #include "../archive.h" @@ -28,6 +29,7 @@ namespace Pink { void Sequence::deserialize(Archive &archive) { NamedObject::deserialize(archive); + debug("\tSequence %s", _name.c_str()); _sequencer = static_cast<Sequencer*>(archive.readObject()); archive >> _items; } diff --git a/engines/pink/sequences/sequencer.cpp b/engines/pink/sequences/sequencer.cpp index b4914bc2f5..f5c9b26812 100644 --- a/engines/pink/sequences/sequencer.cpp +++ b/engines/pink/sequences/sequencer.cpp @@ -21,6 +21,7 @@ */ +#include <common/debug.h> #include "sequencer.h" #include "engines/pink/archive.h" @@ -31,6 +32,7 @@ Sequencer::Sequencer(GamePage *page) {} void Sequencer::deserialize(Archive &archive) { + debug("Sequencer:"); archive >> _sequences; archive.readCount();// intro have 0 timers; //serialize timers; |