[Scummvm-cvs-logs] SF.net SVN: scummvm: [29550] scummvm/trunk/engines/lure/hotspots.cpp

[dreammaster at users.sourceforge.net]

Revision: 29550
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29550&view=rev
Author:   dreammaster
Date:     2007-11-17 22:16:58 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
Bugfix to only delay showing a new talk dialog if there isn't one active in the current room

Modified Paths:
--------------
    scummvm/trunk/engines/lure/hotspots.cpp

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-11-18 06:14:53 UTC (rev 29549)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-11-18 06:16:58 UTC (rev 29550)
@@ -821,7 +821,7 @@
 
 	if (_data->talkCountdown == CONVERSE_COUNTDOWN_SIZE) {
 		// Check if there's already an active dialog - if so, wait until it's finished
-		if (room.isDialogActive() && (res.getTalkingCharacter() != _hotspotId)) {
+		if (room.isDialogShowing() && (res.getTalkingCharacter() != _hotspotId)) {
 			++_data->talkCountdown;
 			if (delayCtr() > 0)
 				setDelayCtr(delayCtr() + 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.