diff options
| author | Paul Gilbert | 2007-10-24 10:09:06 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-10-24 10:09:06 +0000 |
| commit | 547716a0dfd671461a5df85535be40f650c3aa17 (patch) | |
| tree | 89cac41860353318ec7df0640967819d10cb6ad3 /engines/lure/res_struct.cpp | |
| parent | a0fce0c5a174c76891e4128fef43bdb794c16fb3 (diff) | |
| download | scummvm-rg350-547716a0dfd671461a5df85535be40f650c3aa17.tar.gz scummvm-rg350-547716a0dfd671461a5df85535be40f650c3aa17.tar.bz2 scummvm-rg350-547716a0dfd671461a5df85535be40f650c3aa17.zip | |
Added a talkerId field to hotspots to better handle characters being talked to
svn-id: r29254
Diffstat (limited to 'engines/lure/res_struct.cpp')
| -rw-r--r-- | engines/lure/res_struct.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp index b338817b93..d16ff22caa 100644 --- a/engines/lure/res_struct.cpp +++ b/engines/lure/res_struct.cpp @@ -421,6 +421,7 @@ HotspotData::HotspotData(HotspotResource *rec) { blockedFlag = false; coveredFlag = VB_INITIAL; talkMessageId = 0; + talkerId = 0; talkDestCharacterId = 0; talkCountdown = 0; useHotspotId = 0; @@ -462,6 +463,7 @@ void HotspotData::saveToStream(WriteStream *stream) { stream->writeByte((byte)blockedFlag); stream->writeByte((byte)coveredFlag); stream->writeUint16LE(talkMessageId); + stream->writeUint16LE(talkerId); stream->writeUint16LE(talkDestCharacterId); stream->writeUint16LE(talkCountdown); stream->writeUint16LE(pauseCtr); @@ -503,6 +505,7 @@ void HotspotData::loadFromStream(ReadStream *stream) { blockedFlag = stream->readByte() != 0; coveredFlag = (VariantBool)stream->readByte(); talkMessageId = stream->readUint16LE(); + talkerId = stream->readUint16LE(); talkDestCharacterId = stream->readUint16LE(); talkCountdown = stream->readUint16LE(); pauseCtr = stream->readUint16LE(); @@ -1203,7 +1206,6 @@ void ValueTableData::reset() { _playerNewPos.roomNumber = 0; _playerNewPos.position.x = 0; _playerNewPos.position.y = 0; - _flags = GAMEFLAG_4 | GAMEFLAG_1; _hdrFlagMask = 1; for (uint16 index = 0; index < NUM_VALUE_FIELDS; ++index) @@ -1245,7 +1247,6 @@ void ValueTableData::saveToStream(Common::WriteStream *stream) { stream->writeSint16LE(_playerNewPos.position.x); stream->writeSint16LE(_playerNewPos.position.y); stream->writeUint16LE(_playerNewPos.roomNumber); - stream->writeByte(_flags); stream->writeByte(_hdrFlagMask); // Write out the special fields @@ -1259,7 +1260,6 @@ void ValueTableData::loadFromStream(Common::ReadStream *stream) { _playerNewPos.position.x = stream->readSint16LE(); _playerNewPos.position.y = stream->readSint16LE(); _playerNewPos.roomNumber = stream->readUint16LE(); - _flags = stream->readByte(); _hdrFlagMask = stream->readByte(); // Read in the field list |