PINK: Implemented debug output of Objects

scummvm · Jun 28, 2018 · 113540b · 113540b
1 parent f62132c
commit 113540b
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -48,7 +48,7 @@ class NamedObject : public Object {
 
     const Common::String &getName() const;
 
-private:
+protected:
     Common::String _name;
 };
 

diff --git 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
@@ -20,13 +20,16 @@
  *
  */
 
+#include <common/debug.h>
 #include "side_effect_exit.h"
 #include "../archive.h"
 
 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
diff --git 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());
+}
+
+}
diff --git 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
diff --git 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;
 };