diff options
| author | Paul Gilbert | 2007-12-28 22:56:22 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-12-28 22:56:22 +0000 |
| commit | 16b610068db2a67e5ce0b156df87e0a4df23373b (patch) | |
| tree | b6c82666d7f2f654dbeb71ee41d3d4cafb9b2ab5 | |
| parent | 55b6ee3982ddc07797b26df7527bd438255566a5 (diff) | |
| download | scummvm-rg350-16b610068db2a67e5ce0b156df87e0a4df23373b.tar.gz scummvm-rg350-16b610068db2a67e5ce0b156df87e0a4df23373b.tar.bz2 scummvm-rg350-16b610068db2a67e5ce0b156df87e0a4df23373b.zip | |
Fix for correct dialog sequence when giving an object to an arbitrary NPC
svn-id: r30063
| -rw-r--r-- | engines/lure/hotspots.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index c1d4b1f53e..cab41ea4b0 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -1527,7 +1527,7 @@ void Hotspot::doGive(HotspotData *hotspot) { if ((hotspot->hotspotId != PRISONER_ID) || (usedId != BOTTLE_HOTSPOT_ID)) showMessage(7, hotspot->hotspotId); - + uint16 sequenceOffset = res.getHotspotAction(hotspot->actionsOffset, GIVE); if (sequenceOffset >= 0x8000) { @@ -1545,7 +1545,9 @@ void Hotspot::doGive(HotspotData *hotspot) { HotspotData *usedItem = res.getHotspot(usedId); usedItem->roomNumber = hotspot->hotspotId; } else if (sequenceOffset > 1) { - showMessage(result); + Hotspot *destCharacter = res.getActiveHotspot(hotspot->hotspotId); + if (destCharacter != NULL) + destCharacter->showMessage(sequenceOffset, hotspotId()); } } } |