aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2008-01-08 06:18:33 +0000
committerPaul Gilbert2008-01-08 06:18:33 +0000
commitcd23db6ce8fb660320804e1355f37558c2ebccc4 (patch)
tree3e2c809382b3f2a1a543f5a6a46a9c1aed688e7e /engines
parent965eddf0dc0df514a74504d4b92365afe6f3b892 (diff)
downloadscummvm-rg350-cd23db6ce8fb660320804e1355f37558c2ebccc4.tar.gz
scummvm-rg350-cd23db6ce8fb660320804e1355f37558c2ebccc4.tar.bz2
scummvm-rg350-cd23db6ce8fb660320804e1355f37558c2ebccc4.zip
Changed method parameter name to prevent shadowing warning
svn-id: r30340
Diffstat (limited to 'engines')
-rw-r--r--engines/lure/hotspots.cpp8
-rw-r--r--engines/lure/hotspots.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index abad4d31ec..2d39b363f6 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -1077,7 +1077,7 @@ bool Hotspot::findClearBarPlace() {
return false;
}
-bool Hotspot::characterWalkingCheck(uint16 hotspotId) {
+bool Hotspot::characterWalkingCheck(uint16 id) {
Resources &res = Resources::getReference();
int16 xp, yp;
bool altFlag;
@@ -1089,7 +1089,7 @@ bool Hotspot::characterWalkingCheck(uint16 hotspotId) {
_walkFlag = true;
altFlag = false;
- switch (hotspotId) {
+ switch (id) {
case 997:
xp = 169; yp = 146;
altFlag = true;
@@ -1104,10 +1104,10 @@ bool Hotspot::characterWalkingCheck(uint16 hotspotId) {
break;
default:
- hotspot = res.getHotspot(hotspotId);
+ hotspot = res.getHotspot(id);
if (hotspot == NULL) {
// Should never come here, as all other constants are handled
- warning("characterWalkingCheck done on unknown hotspot Id %xh", hotspotId);
+ warning("characterWalkingCheck done on unknown hotspot Id %xh", id);
xp = 78; yp = 162;
} else if ((hotspot->walkX == 0) && (hotspot->walkY == 0)) {
// The hotspot doesn't have any walk co-ordinates
diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h
index dce3e16307..75953b9259 100644
--- a/engines/lure/hotspots.h
+++ b/engines/lure/hotspots.h
@@ -304,7 +304,7 @@ private:
HotspotPrecheckResult actionPrecheck(HotspotData *hotspot);
BarPlaceResult getBarPlace();
bool findClearBarPlace();
- bool characterWalkingCheck(uint16 hotspotId);
+ bool characterWalkingCheck(uint16 id);
bool doorCloseCheck(uint16 doorId);
void resetDirection();