diff options
author | Paul Gilbert | 2007-04-29 11:30:29 +0000 |
---|---|---|
committer | Paul Gilbert | 2007-04-29 11:30:29 +0000 |
commit | 885f687ae597d709441928a6bb484ee703691aca (patch) | |
tree | ed12ed2d3e0aac5c41c1b00067a470b146f56b62 /engines/lure/hotspots.h | |
parent | c0d487830ea8d23b2ca0e0ccb8ecd196dbf5bf53 (diff) | |
download | scummvm-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/hotspots.h')
-rw-r--r-- | engines/lure/hotspots.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h index 9e849b0e28..352c254d0d 100644 --- a/engines/lure/hotspots.h +++ b/engines/lure/hotspots.h @@ -249,7 +249,7 @@ private: uint16 _frameNumber; Direction _direction; uint8 _layer; - uint16 _sequenceOffset; + uint16 _hotspotScriptOffset; uint16 _tickCtr; uint8 _colourOffset; bool _persistant; @@ -359,7 +359,11 @@ public: uint16 yCorrection() { return _yCorrection; } uint16 charRectY() { return _charRectY; } uint16 roomNumber() { return _roomNumber; } - uint16 script() { return _sequenceOffset; } + uint16 talkScript() { + assert(_data); + return _data->talkScriptOffset; + } + uint16 hotspotScript() { return _hotspotScriptOffset; } uint8 layer() { return _layer; } uint16 tickCtr() { return _tickCtr; } bool skipFlag() { return _skipFlag; } @@ -404,10 +408,10 @@ public: void setHeight(uint16 newHeight) { _height = newHeight; } - void setScript(uint16 offset) { + void setHotspotScript(uint16 offset) { assert(_data != NULL); - _sequenceOffset = offset; - _data->sequenceOffset = offset; + _hotspotScriptOffset = offset; + _data->hotspotScriptOffset = offset; } void setLayer(uint8 newLayer) { assert(_data != NULL); |