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

[dreammaster at users.sourceforge.net]

Revision: 29516
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29516&view=rev
Author:   dreammaster
Date:     2007-11-16 00:59:18 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
Changed conversation guards so that the player talking will only be paused if there's another active conversation that's in the same room

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-11-16 08:54:38 UTC (rev 29515)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-11-16 08:59:18 UTC (rev 29516)
@@ -3265,7 +3265,7 @@
 		assert(talkDestCharacter != 0);
 
 		// Make sure any other dialog is finished before we start talking
-		if (room.isDialogActive())
+		if (room.isDialogShowing())
 			return;
 
 		// Fall through to TALK_START

Modified: scummvm/trunk/engines/lure/room.h
===================================================================
--- scummvm/trunk/engines/lure/room.h	2007-11-16 08:54:38 UTC (rev 29515)
+++ scummvm/trunk/engines/lure/room.h	2007-11-16 08:59:18 UTC (rev 29516)
@@ -118,6 +118,11 @@
 	TalkDialog *talkDialog() { return _talkDialog; }
 	void setCursorState(CursorState state) { _cursorState = state; }
 	bool isDialogActive() { return _talkDialog != NULL; }
+	bool isDialogShowing() {
+		Resources &res = Resources::getReference();
+		Hotspot *talkCharacter = res.getActiveHotspot(res.getTalkingCharacter());
+		return isDialogActive() && (talkCharacter != NULL) && (talkCharacter->roomNumber() == _roomNumber);
+	}
 	bool checkInTalkDialog();
 	char *statusLine() { return _statusLine; }
 	void saveToStream(Common::WriteStream *stream);


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