libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjustments to the talk state machine so information dialogs (if any) correctly occur at the end of a conversation (such as giving the bar to Ewan)

Browse Source 
svn-id: r29481
This commit is contained in:
Paul Gilbert 2007-11-12 09:53:10 +00:00
parent 6ccbfcf611
commit 705cf3cc87
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/lure/hotspots.cpp
View File

@ -3333,6 +3333,12 @@ void HotspotTickHandlers::talkAnimHandler(Hotspot &h) {
case TALK_RESPOND:
// Handle initial response to show the question in a talk dialog if needed
if (h.resource()->talkCountdown != 0) {
// Current talk dialog already pending needs to finish
h.handleTalkDialog();
return;
}
// Get the original question for display
selectedLine = res.getTalkSelection();
entry = talkSelections[selectedLine-1];
@ -3400,10 +3406,11 @@ void HotspotTickHandlers::talkAnimHandler(Hotspot &h) {
case TALK_RESPONSE_WAIT:
// Wait until the character's response has finished being displayed
charHotspot = res.getActiveHotspot(talkDestCharacter);
assert(charHotspot);
debugC(ERROR_DETAILED, kLureDebugAnimations, "Player talk dialog countdown %d",
(charHotspot) ? charHotspot->resource()->talkCountdown : 0);
if (res.getTalkingCharacter() != 0)
if ((charHotspot->resource()->talkCountdown > 0) || (res.getTalkingCharacter() != 0))
return;
result = _talkResponse->postSequenceId;