[Scummvm-cvs-logs] SF.net SVN: scummvm: [30337] scummvm/branches/branch-0-11-0/engines/lure/ hotspots.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Tue Jan 8 04:10:12 CET 2008


Revision: 30337
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30337&view=rev
Author:   dreammaster
Date:     2008-01-07 19:10:12 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
Backport of 30336 - fixes crash when waiting for patrol

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp

Modified: scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp	2008-01-08 03:09:00 UTC (rev 30336)
+++ scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp	2008-01-08 03:10:12 UTC (rev 30337)
@@ -2016,7 +2016,7 @@
 
 	_currentActions.top().setSupportData(newEntry);
 	HotspotData *hotspotData = (newEntry->numParams() == 0) ? NULL : res.getHotspot(
-		(newEntry->action() == USE) ? 1 : 0);
+		(newEntry->action() == USE) ? newEntry->param(1) : newEntry->param(0));
 	doAction(newEntry->action(), hotspotData);
 }
 


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




More information about the Scummvm-git-logs mailing list