From 402831b8cae807e46a04db0d3548b0a340e60d50 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Mon, 6 Dec 2010 13:49:56 +0000 Subject: MOHAWK: finish kLBSetPlayInfo reading svn-id: r54797 --- engines/mohawk/livingbooks.cpp | 14 +++++++------- engines/mohawk/livingbooks.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/mohawk') diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index a556381f7e..346a217453 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -1546,14 +1546,15 @@ LBScriptEntry::~LBScriptEntry() { LBItem::LBItem(MohawkEngine_LivingBooks *vm, Common::Rect rect) : _vm(vm), _rect(rect) { _phase = 0; - _timingMode = 0; + + _loopMode = 0; _delayMin = 0; _delayMax = 0; - _loopMode = 0; - _loopCount = 0; + _timingMode = 0; _periodMin = 0; _periodMax = 0; _controlMode = 0; + _soundMode = 0; _neverEnabled = true; _enabled = false; @@ -1727,14 +1728,13 @@ void LBItem::readData(uint16 type, uint16 size, Common::SeekableSubReadStreamEnd _relocPoint.x = stream->readSint16(); _relocPoint.y = stream->readSint16(); _controlMode = stream->readUint16(); - uint16 unknown10 = stream->readUint16(); - // TODO: unknowns + _soundMode = stream->readUint16(); - debug(2, "kLBSetPlayInfo: loop mode %d (%d to %d), timing mode %d (%d to %d), reloc (%d, %d), unknowns %04x, %04x", + debug(2, "kLBSetPlayInfo: loop mode %d (%d to %d), timing mode %d (%d to %d), reloc (%d, %d), control mode %04x, sound mode %04x", _loopMode, _delayMin, _delayMax, _timingMode, _periodMin, _periodMax, _relocPoint.x, _relocPoint.y, - _controlMode, unknown10); + _controlMode, _soundMode); } break; diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h index 342bc7ec7e..e6d99f1b04 100644 --- a/engines/mohawk/livingbooks.h +++ b/engines/mohawk/livingbooks.h @@ -304,8 +304,8 @@ protected: uint16 _loops; uint16 _phase, _timingMode, _delayMin, _delayMax; - uint16 _loopMode, _loopCount, _periodMin, _periodMax; - uint16 _controlMode; + uint16 _loopMode, _periodMin, _periodMax; + uint16 _controlMode, _soundMode; Common::Point _relocPoint; bool _isAmbient; -- cgit v1.2.3