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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Tue Apr 20 12:13:28 CEST 2010


Revision: 48741
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48741&view=rev
Author:   dreammaster
Date:     2010-04-20 10:13:27 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Corrected a debug statement that could use an object field after the object was destroyed

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2010-04-19 23:02:01 UTC (rev 48740)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2010-04-20 10:13:27 UTC (rev 48741)
@@ -1251,8 +1251,9 @@
 
 void Hotspot::doAction(Action action, HotspotData *hotspot) {
 	StringList &stringList = Resources::getReference().stringList();
+	int hotspotId = _hotspotId;
 	debugC(ERROR_INTERMEDIATE, kLureDebugHotspots,  "Action charId=%xh Action=%d/%s",
-		_hotspotId, (int)action, (action > EXAMINE) ? NULL : stringList.getString((int)action));
+		hotspotId, (int)action, (action > EXAMINE) ? NULL : stringList.getString((int)action));
 
 	// Set the ACTIVE_HOTSPOT_ID and USE_HOTSPOT_ID fields
 	if (hotspot != NULL) {
@@ -1374,7 +1375,7 @@
 	}
 
 	debugC(ERROR_DETAILED, kLureDebugHotspots,  "Action charId=%xh Action=%d/%s Complete",
-		_hotspotId, (int)action, (action > EXAMINE) ? NULL : stringList.getString((int)action));
+		hotspotId, (int)action, (action > EXAMINE) ? NULL : stringList.getString((int)action));
 }
 
 void Hotspot::doNothing(HotspotData *hotspot) {


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