diff options
| author | Torbjörn Andersson | 2010-04-21 05:30:38 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-04-21 05:30:38 +0000 |
| commit | 2e89d9607d9190e58bbd7f1f1689a758899309f7 (patch) | |
| tree | fe76fc165e3e29ad8bd1158e72915da3049697b8 | |
| parent | 0ef8fd7ddc49f5c90fd7506a2052308d8432cf7d (diff) | |
| download | scummvm-rg350-2e89d9607d9190e58bbd7f1f1689a758899309f7.tar.gz scummvm-rg350-2e89d9607d9190e58bbd7f1f1689a758899309f7.tar.bz2 scummvm-rg350-2e89d9607d9190e58bbd7f1f1689a758899309f7.zip | |
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.
svn-id: r48759
| -rw-r--r-- | engines/lure/hotspots.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index cdbf0fb603..52ec5700b2 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -1251,9 +1251,9 @@ void Hotspot::doAction() { 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 @@ void Hotspot::doAction(Action action, HotspotData *hotspot) { } 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) { |