thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LURE: Fix crash caused by trying to talk to a character when an ask action is in progress

Browse source
This commit is contained in:
Paul Gilbert 2011-09-09 22:10:03 +10:00
parent 528ff10d2b
commit 197409da40
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/lure/hotspots.cpp
View file

@ -1673,6 +1673,12 @@ void Hotspot::doTalkTo(HotspotData *hotspot) {
faceHotspot(hotspot);
endAction();
// WORKAROUND: Fix crash when talking when an ask conversation is active
if (_data->talkDestCharacterId != 0) {
// Don't allow the talk to start
return;
}
uint16 sequenceOffset = res.getHotspotAction(hotspot->actionsOffset, TALK_TO);
if (sequenceOffset >= 0x8000) {
showMessage(sequenceOffset);