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

[eriktorbjorn at users.sourceforge.net]

Revision: 22409
Author:   eriktorbjorn
Date:     2006-05-11 01:25:09 -0700 (Thu, 11 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22409&view=rev

Log Message:
-----------
This could be completely wrong, but I don't think Hotspot::stopWalking() is
supposed to call setCurrentAction() in Resources, because then ScummVM will
crash in getCurrentActionStr() whenever we try to interact with any object.

Since Hotspot::walkTo() calls setCurrentAction() in Hotspot, it seems like a
reasonable guess that this is the setCurrentAction() that stopWalking() should
call as well.

Modified Paths:
--------------
    scummvm/trunk/engines/lure/hotspots.cpp
Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2006-05-11 08:04:41 UTC (rev 22408)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2006-05-11 08:25:09 UTC (rev 22409)
@@ -308,7 +308,7 @@
 	_actionCtr = 0;
 	_currentActions.clear();
 	Room::getReference().setCursorState(CS_NONE);
-	Resources::getReference().setCurrentAction(NONE);
+	setCurrentAction(NO_ACTION);
 }
 
 void Hotspot::setDirection(Direction dir) {


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