aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/pink/archive.h5
-rw-r--r--engines/pink/objects/actions/action_loop.cpp2
-rw-r--r--engines/pink/objects/actions/action_play.cpp2
-rw-r--r--engines/pink/objects/actions/action_play.h2
-rw-r--r--engines/pink/objects/actions/action_play_with_sfx.cpp2
-rw-r--r--engines/pink/objects/actions/action_talk.cpp2
6 files changed, 10 insertions, 5 deletions
diff --git a/engines/pink/archive.h b/engines/pink/archive.h
index 9a1875869c..cc6711e28c 100644
--- a/engines/pink/archive.h
+++ b/engines/pink/archive.h
@@ -89,6 +89,11 @@ inline Archive &operator>>(Archive &archive, Common::String &string){
return archive;
}
+inline Archive &operator>>(Archive &archive, int32 &num){
+ num = archive.readDWORD();
+ return archive;
+}
+
inline Archive &operator>>(Archive &archive, uint32 &num){
num = archive.readDWORD();
return archive;
diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp
index 2c46b61b48..45a1b08e0f 100644
--- a/engines/pink/objects/actions/action_loop.cpp
+++ b/engines/pink/objects/actions/action_loop.cpp
@@ -46,7 +46,7 @@ void ActionLoop::deserialize(Archive &archive) {
void ActionLoop::toConsole() {
debug("\tActionLoop: _name = %s, _fileName = %s, z = %u, _startFrame = %u,"
- " _endFrame = %u, _intro = %u, _style = %u",
+ " _endFrame = %d, _intro = %u, _style = %u",
_name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame, _intro, _style);
}
diff --git a/engines/pink/objects/actions/action_play.cpp b/engines/pink/objects/actions/action_play.cpp
index 34f11009b5..d8172a729d 100644
--- a/engines/pink/objects/actions/action_play.cpp
+++ b/engines/pink/objects/actions/action_play.cpp
@@ -36,7 +36,7 @@ void ActionPlay::deserialize(Archive &archive) {
void ActionPlay::toConsole() {
debug("\tActionPlay: _name = %s, _fileName = %s, z = %u, _startFrame = %u,"
- " _endFrame = %u", _name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame);
+ " _endFrame = %d", _name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame);
}
void ActionPlay::end() {
diff --git a/engines/pink/objects/actions/action_play.h b/engines/pink/objects/actions/action_play.h
index 83318b0c1e..319d05921c 100644
--- a/engines/pink/objects/actions/action_play.h
+++ b/engines/pink/objects/actions/action_play.h
@@ -39,7 +39,7 @@ public:
protected:
virtual void onStart();
- uint32 _stopFrame;
+ int32 _stopFrame;
};
} // End of namespace Pink
diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp
index 44033705ff..2c23fa0903 100644
--- a/engines/pink/objects/actions/action_play_with_sfx.cpp
+++ b/engines/pink/objects/actions/action_play_with_sfx.cpp
@@ -35,7 +35,7 @@ void ActionPlayWithSfx::deserialize(Pink::Archive &archive) {
void ActionPlayWithSfx::toConsole() {
debug("\tActionPlayWithSfx: _name = %s, _fileName = %s, z = %u, _startFrame = %u,"
- " _endFrame = %u, _isLoop = %u", _name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame, _isLoop);
+ " _endFrame = %d, _isLoop = %u", _name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame, _isLoop);
for (uint i = 0; i < _sfxArray.size(); ++i) {
_sfxArray[i]->toConsole();
}
diff --git a/engines/pink/objects/actions/action_talk.cpp b/engines/pink/objects/actions/action_talk.cpp
index 644e14374c..20abdc00f1 100644
--- a/engines/pink/objects/actions/action_talk.cpp
+++ b/engines/pink/objects/actions/action_talk.cpp
@@ -36,7 +36,7 @@ void ActionTalk::deserialize(Archive &archive) {
void ActionTalk::toConsole() {
debug("\tActionTalk: _name = %s, _fileName = %s, z = %u, _startFrame = %u,"
- " _endFrame = %u, _intro = %u, _style = %u, _vox = %s",
+ " _endFrame = %d, _intro = %u, _style = %u, _vox = %s",
_name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame, _intro, _style, _vox.c_str());
}