mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-16 06:39:17 +00:00
Bugfix for talk dialog not closing if the same character talks twice in immediate succession
svn-id: r29515
This commit is contained in:
parent
6f23a38c12
commit
fe690d5688
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user