diff options
| author | whiterandrek | 2018-06-01 22:26:59 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
| commit | 001a08c91c8e598400f101710c6216261774cc93 (patch) | |
| tree | fb8c9747ee3b93c264ca4435f3ecc14a22ed18bd /engines | |
| parent | 80622943e49d299f5f79040df167fa662b684f88 (diff) | |
| download | scummvm-rg350-001a08c91c8e598400f101710c6216261774cc93.tar.gz scummvm-rg350-001a08c91c8e598400f101710c6216261774cc93.tar.bz2 scummvm-rg350-001a08c91c8e598400f101710c6216261774cc93.zip | |
PINK: fix deserializing of ActionText
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/pink/objects/actions/action_text.cpp | 17 | ||||
| -rw-r--r-- | engines/pink/objects/actions/action_text.h | 9 |
2 files changed, 18 insertions, 8 deletions
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp index 3e05346b88..f9ef86a1c2 100644 --- a/engines/pink/objects/actions/action_text.cpp +++ b/engines/pink/objects/actions/action_text.cpp @@ -28,9 +28,14 @@ namespace Pink { void ActionText::deserialize(Archive &archive) { - for (int i = 0; i < 4 ; ++i) { - _bounds[i] = archive.readDWORD(); - } + Action::deserialize(archive); + _fileName = archive.readString(); + + _xLeft = archive.readDWORD(); + _yTop = archive.readDWORD(); + _xRight = archive.readDWORD(); + _yBottom = archive.readDWORD(); + _centered = archive.readDWORD(); _scrollBar = archive.readDWORD(); _textColor = archive.readDWORD(); @@ -38,9 +43,9 @@ void ActionText::deserialize(Archive &archive) { } void ActionText::toConsole() { - debug("\tActionText: _name = %s, _text = %s, " - "_bound0 = %u, _bound1 = %u, _bound2 = %u, _bound3 = %u _centered = %u, _scrollBar = %u, _textColor = %u _backgroundColor = %u", - _name.c_str(), _text.c_str(), _bounds[0], _bounds[1], _bounds[2], _bounds[3], _centered, _scrollBar, _textColor, _backgroundColor); + debug("\tActionText: _name = %s, _fileName = %s, " + "_xLeft = %u, _yTop = %u, _xRight = %u, _yBottom = %u _centered = %u, _scrollBar = %u, _textColor = %u _backgroundColor = %u", + _name.c_str(), _fileName.c_str(), _xLeft, _yTop, _xRight, _yBottom, _centered, _scrollBar, _textColor, _backgroundColor); } } // End of namespace Pink diff --git a/engines/pink/objects/actions/action_text.h b/engines/pink/objects/actions/action_text.h index c881610fad..e0cc752c4b 100644 --- a/engines/pink/objects/actions/action_text.h +++ b/engines/pink/objects/actions/action_text.h @@ -34,8 +34,13 @@ public: void toConsole() override; private: - Common::String _text; - uint32 _bounds[4]; + Common::String _fileName; + + uint32 _xLeft; + uint32 _yTop; + uint32 _xRight; + uint32 _yBottom; + uint32 _centered; uint32 _scrollBar; uint32 _textColor; |