aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwhitertandrek2018-03-22 14:51:13 +0200
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commit8874ccb9de1936c7fc1ae83bccd3d85344617285 (patch)
treed32e7c02bbdaebb73d4bbf29eb0b6ec3a82661cc
parenteb6ce676e4e604f510cbf3f4d651c18911f4468f (diff)
downloadscummvm-rg350-8874ccb9de1936c7fc1ae83bccd3d85344617285.tar.gz
scummvm-rg350-8874ccb9de1936c7fc1ae83bccd3d85344617285.tar.bz2
scummvm-rg350-8874ccb9de1936c7fc1ae83bccd3d85344617285.zip
PINK: added debug information to actions
-rw-r--r--engines/pink/objects/actions/action_hide.cpp6
-rw-r--r--engines/pink/objects/actions/action_hide.h2
-rw-r--r--engines/pink/objects/actions/action_play.cpp9
-rw-r--r--engines/pink/objects/actions/action_play.h3
-rw-r--r--engines/pink/objects/actions/action_sound.cpp3
-rw-r--r--engines/pink/objects/actions/action_still.cpp9
-rw-r--r--engines/pink/objects/actions/action_still.h4
7 files changed, 32 insertions, 4 deletions
diff --git a/engines/pink/objects/actions/action_hide.cpp b/engines/pink/objects/actions/action_hide.cpp
index 7df43662bc..b89d4c9627 100644
--- a/engines/pink/objects/actions/action_hide.cpp
+++ b/engines/pink/objects/actions/action_hide.cpp
@@ -32,13 +32,13 @@ void Pink::ActionHide::deserialize(Archive &archive) {
Action::deserialize(archive);
}
-void ActionHide::play(bool unk_startNow) {
- debug("ActionHide %s is now in playing state", _name.c_str());
+void ActionHide::start(bool unk_startNow) {
+ debug("Actor %s has now ActionHide %s", _actor->getName().c_str(), _name.c_str());
_actor->endAction();
}
void ActionHide::end() {
- debug("ActionHide %s is ended", _name.c_str());
+ debug("ActionHide %s of Actor %s is ended", _name.c_str(), _actor->getName().c_str());
}
void ActionHide::toConsole() {
diff --git a/engines/pink/objects/actions/action_hide.h b/engines/pink/objects/actions/action_hide.h
index fa6e717ede..2e52fdc331 100644
--- a/engines/pink/objects/actions/action_hide.h
+++ b/engines/pink/objects/actions/action_hide.h
@@ -33,7 +33,7 @@ public:
virtual void toConsole();
- virtual void play(bool unk_startNow);
+ virtual void start(bool unk_startNow);
virtual void end();
};
diff --git a/engines/pink/objects/actions/action_play.cpp b/engines/pink/objects/actions/action_play.cpp
index 5e6b692d30..051f3c42fe 100644
--- a/engines/pink/objects/actions/action_play.cpp
+++ b/engines/pink/objects/actions/action_play.cpp
@@ -22,6 +22,7 @@
#include <common/debug.h>
#include "action_play.h"
+#include "../actors/actor.h"
#include "engines/pink/archive.h"
namespace Pink {
@@ -36,4 +37,12 @@ void ActionPlay::toConsole() {
" _endFrame = %u", _name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame);
}
+void ActionPlay::start(bool unk) {
+ debug("Actor %s has now ActionPlay %s", _actor->getName().c_str(), _name.c_str());
+}
+
+void ActionPlay::end() {
+ debug("ActionPlay %s of Actor %s is ended", _name.c_str(), _actor->getName().c_str());
+}
+
} // End of namespace Pink
diff --git a/engines/pink/objects/actions/action_play.h b/engines/pink/objects/actions/action_play.h
index d53b44a1d1..8ae91498a5 100644
--- a/engines/pink/objects/actions/action_play.h
+++ b/engines/pink/objects/actions/action_play.h
@@ -33,6 +33,9 @@ public:
virtual void deserialize(Archive &archive);
virtual void toConsole();
+ virtual void start(bool unk);
+ virtual void end();
+
private:
uint32 _stopFrame;
};
diff --git a/engines/pink/objects/actions/action_sound.cpp b/engines/pink/objects/actions/action_sound.cpp
index f389f97a1a..38f8687d33 100644
--- a/engines/pink/objects/actions/action_sound.cpp
+++ b/engines/pink/objects/actions/action_sound.cpp
@@ -56,9 +56,12 @@ void ActionSound::start(bool unk) {
_sound->play(soundType, _volume, _isLoop);
if (_isLoop)
_actor->endAction();
+
+ debug("Actor %s has now ActionSound %s", _actor->getName().c_str(), _name.c_str());
}
void ActionSound::end() {
+ debug("ActionSound %s of Actor %s is ended", _name.c_str(), _actor->getName().c_str());
_sound->stop();
delete _sound;
_sound = nullptr;
diff --git a/engines/pink/objects/actions/action_still.cpp b/engines/pink/objects/actions/action_still.cpp
index 3c6bf17cad..ca5793b503 100644
--- a/engines/pink/objects/actions/action_still.cpp
+++ b/engines/pink/objects/actions/action_still.cpp
@@ -23,6 +23,7 @@
#include <common/debug.h>
#include "action_still.h"
#include "engines/pink/archive.h"
+#include <engines/pink/objects/actors/actor.h>
namespace Pink {
@@ -36,4 +37,12 @@ void ActionStill::toConsole() {
_name.c_str(), _fileName.c_str(), _startFrame);
}
+void ActionStill::start(bool unk) {
+ debug("Actor %s has now ActionStill %s", _actor->getName().c_str(), _name.c_str());
+}
+
+void ActionStill::end() {
+ debug("ActionStill %s of Actor %s is ended", _name.c_str(), _actor->getName().c_str());
+}
+
} // End of namespace Pink \ No newline at end of file
diff --git a/engines/pink/objects/actions/action_still.h b/engines/pink/objects/actions/action_still.h
index 075371a9cc..d77706103b 100644
--- a/engines/pink/objects/actions/action_still.h
+++ b/engines/pink/objects/actions/action_still.h
@@ -32,6 +32,10 @@ public:
virtual void deserialize(Archive &archive);
virtual void toConsole();
+ virtual void start(bool unk);
+
+ virtual void end();
+
protected:
uint32 _startFrame;
};