From 2e89d9607d9190e58bbd7f1f1689a758899309f7 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 21 Apr 2010 05:30:38 +0000
Subject: 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
---
 engines/lure/hotspots.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/lure')

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) {
-- 
cgit v1.2.3