Bugfix for talk dialog not closing if the same character talks twice in immediate succession

svn-id: r29515
This commit is contained in:
Paul Gilbert 2007-11-16 08:54:38 +00:00
parent 6f23a38c12
commit fe690d5688

View File

@ -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;