diff options
| author | Paul Gilbert | 2007-11-16 08:54:38 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-11-16 08:54:38 +0000 |
| commit | fe690d56889964465a70c482d41c1448e5de34f2 (patch) | |
| tree | 670f0a5efb27e3950e355070d3d87fb968effdd5 | |
| parent | 6f23a38c127ecfe2e5445ba4e12e66da9b69e7b0 (diff) | |
| download | scummvm-rg350-fe690d56889964465a70c482d41c1448e5de34f2.tar.gz scummvm-rg350-fe690d56889964465a70c482d41c1448e5de34f2.tar.bz2 scummvm-rg350-fe690d56889964465a70c482d41c1448e5de34f2.zip | |
Bugfix for talk dialog not closing if the same character talks twice in immediate succession
svn-id: r29515
| -rw-r--r-- | engines/lure/res.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index 43c94a6618..d5e71591db 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -486,15 +486,10 @@ void Resources::setTalkingCharacter(uint16 id) { deactivateHotspot(_talkingCharacter, true); HotspotData *charHotspot = res.getHotspot(_talkingCharacter); assert(charHotspot); - charHotspot->talkCountdown = 0; -/* - if (charHotspot->talkDestCharacterId != 0) { - HotspotData *destHotspot = res.getHotspot(charHotspot->talkDestCharacterId); - if (destHotspot != NULL) - destHotspot->talkDestCharacterId = 0; - } -*/ charHotspot->talkDestCharacterId = 0; + + if (_talkingCharacter != id) + charHotspot->talkCountdown = 0; } _talkingCharacter = id; |