diff options
author | whitertandrek | 2018-03-25 23:02:03 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | 17c2bcfb948a24f9a1d99eeac85f799d45549d9f (patch) | |
tree | cca02f41207543a604691d307d55ec17d0001475 /engines/pink/objects | |
parent | 0e39a87862253841e133a8f098b492cd4f5dd255 (diff) | |
download | scummvm-rg350-17c2bcfb948a24f9a1d99eeac85f799d45549d9f.tar.gz scummvm-rg350-17c2bcfb948a24f9a1d99eeac85f799d45549d9f.tar.bz2 scummvm-rg350-17c2bcfb948a24f9a1d99eeac85f799d45549d9f.zip |
PINK: fixed ActionSfx deserialization
Diffstat (limited to 'engines/pink/objects')
-rw-r--r-- | engines/pink/objects/actions/action_play_with_sfx.cpp | 7 | ||||
-rw-r--r-- | engines/pink/objects/actions/action_play_with_sfx.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp index 9e4767d41d..60ecd2ac9d 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.cpp +++ b/engines/pink/objects/actions/action_play_with_sfx.cpp @@ -22,7 +22,6 @@ #include "action_play_with_sfx.h" #include <pink/archive.h> -#include <common/debug.h> namespace Pink { @@ -40,11 +39,13 @@ void Pink::ActionPlayWithSfx::toConsole() { } void Pink::ActionSfx::deserialize(Pink::Archive &archive) { - archive >> _sfx >> _volume >> _frame; + archive >> _frame >> _volume >> _sfx; + _action = (ActionPlayWithSfx*) archive.readObject(); + } void Pink::ActionSfx::toConsole() { - debug("\t\tActionSfx: _name = %s, _volume = %u, _frame = %u"); + debug("\t\tActionSfx: _sfx = %s, _volume = %u, _frame = %u", _sfx.c_str(), _volume, _frame); } } // End of namespace Pink
\ No newline at end of file diff --git a/engines/pink/objects/actions/action_play_with_sfx.h b/engines/pink/objects/actions/action_play_with_sfx.h index 6a10edd0ba..b558ee1c13 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.h +++ b/engines/pink/objects/actions/action_play_with_sfx.h @@ -45,6 +45,7 @@ public: virtual void toConsole(); private: + ActionPlayWithSfx *_action; Common::String _sfx; uint32 _volume; uint32 _frame; |