[Scummvm-cvs-logs] scummvm master -> 197409da40b2a7a4064edf05ecf5f520faef8eea

dreammaster dreammaster at scummvm.org
Fri Sep 9 14:15:12 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

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


Commit: 197409da40b2a7a4064edf05ecf5f520faef8eea
    https://github.com/scummvm/scummvm/commit/197409da40b2a7a4064edf05ecf5f520faef8eea
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-09T05:10:03-07:00

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

Changed paths:
    engines/lure/hotspots.cpp



diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index f38bac6..96e5e08 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -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);






More information about the Scummvm-git-logs mailing list