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

[dreammaster at users.sourceforge.net]

Revision: 48535
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48535&view=rev
Author:   dreammaster
Date:     2010-04-05 07:27:16 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
Corrected check to ensure return isn't issued if it's already in progress

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2010-04-05 07:22:34 UTC (rev 48534)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2010-04-05 07:27:16 UTC (rev 48535)
@@ -4022,7 +4022,8 @@
 		if (h.currentActions().size() > 1) {
 			// Pending items on stack
 			if (h.startRoomNumber() != 0) {
-				if (!h.currentActions().bottom().hasSupportData() || (h.currentActions().bottom().action() != RETURN)) {
+				if (!h.currentActions().bottom().hasSupportData() || 
+					(h.currentActions().bottom().supportData().action() != RETURN)) {
 					// Signal character to return
 					h.currentActions().clear();
 					h.currentActions().addFront(RETURN, h.startRoomNumber(), 0, 0);


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