[Scummvm-cvs-logs] SF.net SVN: scummvm:[48759] scummvm/trunk/engines/lure/hotspots.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Wed Apr 21 07:30:38 CEST 2010
Revision: 48759
http://scummvm.svn.sourceforge.net/scummvm/?rev=48759&view=rev
Author: eriktorbjorn
Date: 2010-04-21 05:30:38 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
Fixed GCC warning about 'hotspotId' shadowing a member of 'this'. Let's call
the variable 'charId' instead, like in the debug messages where it's used.
Modified Paths:
--------------
scummvm/trunk/engines/lure/hotspots.cpp
Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp 2010-04-20 21:18:37 UTC (rev 48758)
+++ scummvm/trunk/engines/lure/hotspots.cpp 2010-04-21 05:30:38 UTC (rev 48759)
@@ -1251,9 +1251,9 @@
void Hotspot::doAction(Action action, HotspotData *hotspot) {
StringList &stringList = Resources::getReference().stringList();
- int hotspotId = _hotspotId;
+ int charId = _hotspotId;
debugC(ERROR_INTERMEDIATE, kLureDebugHotspots, "Action charId=%xh Action=%d/%s",
- hotspotId, (int)action, (action > EXAMINE) ? NULL : stringList.getString((int)action));
+ charId, (int)action, (action > EXAMINE) ? NULL : stringList.getString((int)action));
// Set the ACTIVE_HOTSPOT_ID and USE_HOTSPOT_ID fields
if (hotspot != NULL) {
@@ -1375,7 +1375,7 @@
}
debugC(ERROR_DETAILED, kLureDebugHotspots, "Action charId=%xh Action=%d/%s Complete",
- hotspotId, (int)action, (action > EXAMINE) ? NULL : stringList.getString((int)action));
+ charId, (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