aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/res_struct.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2007-04-29 11:30:29 +0000
committerPaul Gilbert2007-04-29 11:30:29 +0000
commit885f687ae597d709441928a6bb484ee703691aca (patch)
treeed12ed2d3e0aac5c41c1b00067a470b146f56b62 /engines/lure/res_struct.cpp
parentc0d487830ea8d23b2ca0e0ccb8ecd196dbf5bf53 (diff)
downloadscummvm-rg350-885f687ae597d709441928a6bb484ee703691aca.tar.gz
scummvm-rg350-885f687ae597d709441928a6bb484ee703691aca.tar.bz2
scummvm-rg350-885f687ae597d709441928a6bb484ee703691aca.zip
Reworked hotspot actions so that talking to characters work properly
svn-id: r26675
Diffstat (limited to 'engines/lure/res_struct.cpp')
-rw-r--r--engines/lure/res_struct.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 3b2620dea6..aa6f4b2782 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -321,10 +321,11 @@ HotspotData::HotspotData(HotspotResource *rec) {
talkY = rec->talkY;
colourOffset = FROM_LE_16(rec->colourOffset);
animRecordId = FROM_LE_16(rec->animRecordId);
- sequenceOffset = FROM_LE_16(rec->sequenceOffset);
+ hotspotScriptOffset = FROM_LE_16(rec->hotspotScriptOffset);
+ talkScriptOffset = FROM_LE_16(rec->talkScriptOffset);
tickProcOffset = FROM_LE_16(rec->tickProcOffset);
tickTimeout = FROM_LE_16(rec->tickTimeout);
- tickSequenceOffset = FROM_LE_16(rec->tickSequenceOffset);
+ tickScriptOffset = FROM_LE_16(rec->tickScriptOffset);
npcSchedule = FROM_LE_16(rec->npcSchedule);
characterMode = (CharacterMode) FROM_LE_16(rec->characterMode);
delayCtr = FROM_LE_16(rec->delayCtr);
@@ -362,10 +363,10 @@ void HotspotData::saveToStream(WriteStream *stream) {
stream->writeUint16LE(widthCopy);
stream->writeUint16LE(heightCopy);
stream->writeUint16LE(yCorrection);
- stream->writeUint16LE(sequenceOffset);
+ stream->writeUint16LE(hotspotScriptOffset);
stream->writeUint16LE(tickProcOffset);
stream->writeUint16LE(tickTimeout);
- stream->writeUint16LE(tickSequenceOffset);
+ stream->writeUint16LE(tickScriptOffset);
stream->writeUint16LE(characterMode);
stream->writeUint16LE(delayCtr);
@@ -402,10 +403,10 @@ void HotspotData::loadFromStream(ReadStream *stream) {
widthCopy = stream->readUint16LE();
heightCopy = stream->readUint16LE();
yCorrection = stream->readUint16LE();
- sequenceOffset = stream->readUint16LE();
+ hotspotScriptOffset = stream->readUint16LE();
tickProcOffset = stream->readUint16LE();
tickTimeout = stream->readUint16LE();
- tickSequenceOffset = stream->readUint16LE();
+ tickScriptOffset = stream->readUint16LE();
characterMode = (CharacterMode) stream->readUint16LE();
delayCtr = stream->readUint16LE();