aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/pink/actions/action.h2
-rw-r--r--engines/pink/actions/action_cel.h2
-rw-r--r--engines/pink/actions/action_play.cpp3
-rw-r--r--engines/pink/actions/action_sound.cpp3
-rw-r--r--engines/pink/actions/action_still.h2
-rw-r--r--engines/pink/actors/actor.cpp4
-rw-r--r--engines/pink/handlers/handler.h2
-rw-r--r--engines/pink/handlers/handler_sequences.h2
-rw-r--r--engines/pink/handlers/handler_start_page.cpp13
-rw-r--r--engines/pink/handlers/handler_start_page.h3
-rw-r--r--engines/pink/object.cpp1
-rw-r--r--engines/pink/object.h2
-rw-r--r--engines/pink/page.cpp2
-rw-r--r--engines/pink/side_effects/side_effect_exit.cpp3
-rw-r--r--engines/pink/side_effects/side_effect_module_variable.cpp15
-rw-r--r--engines/pink/side_effects/side_effect_module_variable.h5
-rw-r--r--engines/pink/side_effects/side_effect_variable.h2
17 files changed, 55 insertions, 11 deletions
diff --git a/engines/pink/actions/action.h b/engines/pink/actions/action.h
index 3d7130309d..5608b99232 100644
--- a/engines/pink/actions/action.h
+++ b/engines/pink/actions/action.h
@@ -33,7 +33,7 @@ class Action : public NamedObject {
public:
virtual void deserialize(Archive &archive);
-private:
+protected:
Actor *_actor;
};
diff --git a/engines/pink/actions/action_cel.h b/engines/pink/actions/action_cel.h
index 346b9d21d6..ca481f7747 100644
--- a/engines/pink/actions/action_cel.h
+++ b/engines/pink/actions/action_cel.h
@@ -31,7 +31,7 @@ class ActionCEL : public Action {
public:
virtual void deserialize(Archive &archive);
-private:
+protected:
Common::String _fileName;
uint32 _z; // Z coordinate for sprite
};
diff --git a/engines/pink/actions/action_play.cpp b/engines/pink/actions/action_play.cpp
index d31775db1a..9dc2ef479a 100644
--- a/engines/pink/actions/action_play.cpp
+++ b/engines/pink/actions/action_play.cpp
@@ -20,6 +20,7 @@
*
*/
+#include <common/debug.h>
#include "action_play.h"
#include "../archive.h"
@@ -28,6 +29,8 @@ namespace Pink {
void ActionPlay::deserialize(Archive &archive) {
ActionStill::deserialize(archive);
archive >> _stopFrame;
+ debug("\tActionPlay: _name = %s, _fileName = %s, z = %u, _startFrame = %u,"
+ " _endFrame = %u", _name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame);
}
} // End of namespace Pink
diff --git a/engines/pink/actions/action_sound.cpp b/engines/pink/actions/action_sound.cpp
index b5e5c5e9e4..ee85689d4f 100644
--- a/engines/pink/actions/action_sound.cpp
+++ b/engines/pink/actions/action_sound.cpp
@@ -20,6 +20,7 @@
*
*/
+#include <common/debug.h>
#include "action_sound.h"
#include "../archive.h"
@@ -31,6 +32,8 @@ void ActionSound::deserialize(Archive &archive) {
_volume = archive.readDWORD();
_isLoop = (bool) archive.readDWORD();
_isBackground = (bool) archive.readDWORD();
+ debug("\tActionSound: _name = %s, _fileName = %s, _volume = %u, _isLoop = %u,"
+ " _isBackground = %u", _name.c_str(), _fileName.c_str(), _volume, _isLoop, _isBackground);
}
} // End of namespace Pink \ No newline at end of file
diff --git a/engines/pink/actions/action_still.h b/engines/pink/actions/action_still.h
index 9d6c7be9d0..1400766a91 100644
--- a/engines/pink/actions/action_still.h
+++ b/engines/pink/actions/action_still.h
@@ -31,7 +31,7 @@ class ActionStill : public ActionCEL {
public:
virtual void deserialize(Archive &archive);
-private:
+protected:
uint32 _startFrame;
};
diff --git a/engines/pink/actors/actor.cpp b/engines/pink/actors/actor.cpp
index 30f7e7b12f..c7a5a9a94a 100644
--- a/engines/pink/actors/actor.cpp
+++ b/engines/pink/actors/actor.cpp
@@ -22,12 +22,16 @@
#include "actor.h"
#include "../page.h"
+#include "lead_actor.h"
namespace Pink {
void Actor::deserialize(Archive &archive) {
NamedObject::deserialize(archive);
_page = static_cast<GamePage*>(archive.readObject());
+ if (dynamic_cast<LeadActor*>(this))
+ debug("LeadActor: _name = %s", _name.c_str());
+ else debug("Actor: _name = %s", _name.c_str());
archive >> _actions;
}
diff --git a/engines/pink/handlers/handler.h b/engines/pink/handlers/handler.h
index 1acd9adff4..6bcac49567 100644
--- a/engines/pink/handlers/handler.h
+++ b/engines/pink/handlers/handler.h
@@ -34,7 +34,7 @@ class Handler : public Object {
public:
virtual void deserialize(Archive &archive);
-private:
+protected:
//_conditions
Common::Array<SideEffect*> _sideEffects;
};
diff --git a/engines/pink/handlers/handler_sequences.h b/engines/pink/handlers/handler_sequences.h
index 46023ea91c..7641b178da 100644
--- a/engines/pink/handlers/handler_sequences.h
+++ b/engines/pink/handlers/handler_sequences.h
@@ -31,7 +31,7 @@ class HandlerSequences : public Handler {
public:
virtual void deserialize(Archive &archive);
-private:
+protected:
StringArray _sequences;
};
diff --git a/engines/pink/handlers/handler_start_page.cpp b/engines/pink/handlers/handler_start_page.cpp
index 58d8830ddc..8fef49eee2 100644
--- a/engines/pink/handlers/handler_start_page.cpp
+++ b/engines/pink/handlers/handler_start_page.cpp
@@ -20,6 +20,19 @@
*
*/
+#include "handler_start_page.h"
+#include <common/debug.h>
+#include "../archive.h"
+
namespace Pink {
+void HandlerStartPage::deserialize(Archive &archive) {
+ debug("HandlerStartPage: ");
+ HandlerSequences::deserialize(archive);
+
+ for (uint i = 0; i < _sequences.size(); ++i) {
+ debug("\t%s", _sequences[i].c_str());
+ }
+}
+
} // End of namespace Pink \ No newline at end of file
diff --git a/engines/pink/handlers/handler_start_page.h b/engines/pink/handlers/handler_start_page.h
index 202b320846..a273e1e354 100644
--- a/engines/pink/handlers/handler_start_page.h
+++ b/engines/pink/handlers/handler_start_page.h
@@ -29,7 +29,8 @@
namespace Pink {
class HandlerStartPage : public HandlerSequences {
-
+public:
+ virtual void deserialize(Archive &archive);
};
} // End of namespace Pink
diff --git a/engines/pink/object.cpp b/engines/pink/object.cpp
index 5e99bd7c7a..3d0a2ae0f6 100644
--- a/engines/pink/object.cpp
+++ b/engines/pink/object.cpp
@@ -20,6 +20,7 @@
*
*/
+#include <common/debug.h>
#include "object.h"
#include "archive.h"
diff --git a/engines/pink/object.h b/engines/pink/object.h
index f8abf4e9b9..bd058cf958 100644
--- a/engines/pink/object.h
+++ b/engines/pink/object.h
@@ -48,7 +48,7 @@ public:
const Common::String &getName() const;
-private:
+protected:
Common::String _name;
};
diff --git a/engines/pink/page.cpp b/engines/pink/page.cpp
index 411da0b0db..e802250f17 100644
--- a/engines/pink/page.cpp
+++ b/engines/pink/page.cpp
@@ -71,7 +71,7 @@ void GamePage::loadFields() {
_resMgr.init(_module->getGame(), this);
- // memfile manipulations
+ // memfile manipulations if from save or page changing
}
diff --git a/engines/pink/side_effects/side_effect_exit.cpp b/engines/pink/side_effects/side_effect_exit.cpp
index 5232012ea6..0a14e1c3c4 100644
--- a/engines/pink/side_effects/side_effect_exit.cpp
+++ b/engines/pink/side_effects/side_effect_exit.cpp
@@ -20,6 +20,7 @@
*
*/
+#include <common/debug.h>
#include "side_effect_exit.h"
#include "../archive.h"
@@ -27,6 +28,8 @@ namespace Pink {
void SideEffectExit::deserialize(Archive &archive) {
archive >> _nextModule >> _nextPage;
+ debug("\tSideEffectExit: _nextModule = %s, _nextPage = %s",
+ _nextModule.c_str(), _nextPage.c_str());
}
} // End of namespace Pink \ No newline at end of file
diff --git a/engines/pink/side_effects/side_effect_module_variable.cpp b/engines/pink/side_effects/side_effect_module_variable.cpp
index 4972ad00bb..5f3c85729f 100644
--- a/engines/pink/side_effects/side_effect_module_variable.cpp
+++ b/engines/pink/side_effects/side_effect_module_variable.cpp
@@ -1,3 +1,7 @@
+#include <engines/pink/archive.h>
+#include <common/debug.h>
+#include "side_effect_variable.h"
+
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
@@ -20,3 +24,14 @@
*
*/
+#include "side_effect_module_variable.h"
+
+namespace Pink {
+
+void SideEffectModuleVariable::deserialize(Archive &archive) {
+ SideEffectVariable::deserialize(archive);
+ debug("\tSideEffectModuleVariable: _name = %s _value = %s",
+ _name.c_str(), _value.c_str());
+}
+
+} \ No newline at end of file
diff --git a/engines/pink/side_effects/side_effect_module_variable.h b/engines/pink/side_effects/side_effect_module_variable.h
index dc46dedadb..68156f12ad 100644
--- a/engines/pink/side_effects/side_effect_module_variable.h
+++ b/engines/pink/side_effects/side_effect_module_variable.h
@@ -27,9 +27,10 @@
namespace Pink {
class SideEffectModuleVariable : public SideEffectVariable {
-
+public:
+ virtual void deserialize(Archive &archive);
};
-}
+} // End of namespace Pink
#endif \ No newline at end of file
diff --git a/engines/pink/side_effects/side_effect_variable.h b/engines/pink/side_effects/side_effect_variable.h
index 15d638035e..c5b45f1e47 100644
--- a/engines/pink/side_effects/side_effect_variable.h
+++ b/engines/pink/side_effects/side_effect_variable.h
@@ -31,7 +31,7 @@ class SideEffectVariable : public SideEffect {
public:
virtual void deserialize(Archive &archive);
-private:
+protected:
Common::String _name;
Common::String _value;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-19 10:26:26 +0000