diff options
| author | Paul Gilbert | 2007-11-08 10:50:26 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-11-08 10:50:26 +0000 |
| commit | ea19791de5fa24ea51eee2b82d18b5943eb5c808 (patch) | |
| tree | b5c4807a49e9ef2ee1078eaf61b4d72750513d3a /engines/lure/hotspots.cpp | |
| parent | cc4311f10f874ab46673fb26cd9298c3f1f25db5 (diff) | |
| download | scummvm-rg350-ea19791de5fa24ea51eee2b82d18b5943eb5c808.tar.gz scummvm-rg350-ea19791de5fa24ea51eee2b82d18b5943eb5c808.tar.bz2 scummvm-rg350-ea19791de5fa24ea51eee2b82d18b5943eb5c808.zip | |
Bugfix for approaching Ratpouch, and have him properly stand still until he's received instructions
svn-id: r29449
Diffstat (limited to 'engines/lure/hotspots.cpp')
| -rw-r--r-- | engines/lure/hotspots.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index 3aa40394ef..1c82853e9b 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -747,8 +747,9 @@ void Hotspot::converse(uint16 destCharacterId, uint16 messageId, bool standStill // in case the destination is already in process of talking HotspotData *hotspot = Resources::getReference().getHotspot(destCharacterId); _data->talkCountdown += hotspot->talkCountdown; - -// hotspot->talkerId = _hotspotId ; + + if (hotspot->talkCountdown == 0) + hotspot->talkerId = _hotspotId ; hotspot->talkGate = 0; } @@ -1559,7 +1560,7 @@ void Hotspot::doTell(HotspotData *hotspot) { return; } - converse(hotspot->hotspotId, 0x7C); + converse(hotspot->hotspotId, 0x7C, true); uint16 sequenceOffset = res.getHotspotAction(hotspot->actionsOffset, TELL); if (sequenceOffset >= 0x8000) { |