[Scummvm-cvs-logs] SF.net SVN: scummvm: [30341] scummvm/branches/branch-0-11-0/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 30341
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30341&view=rev
Author:   dreammaster
Date:     2008-01-07 22:20:21 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
Changed method parameter name to prevent shadowing warning

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp
    scummvm/branches/branch-0-11-0/engines/lure/hotspots.h

Modified: scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp	2008-01-08 06:18:33 UTC (rev 30340)
+++ scummvm/branches/branch-0-11-0/engines/lure/hotspots.cpp	2008-01-08 06:20:21 UTC (rev 30341)
@@ -1076,7 +1076,7 @@
 	return false;
 }
 
-bool Hotspot::characterWalkingCheck(uint16 hotspotId) {
+bool Hotspot::characterWalkingCheck(uint16 id) {
 	Resources &res = Resources::getReference();
 	int16 xp, yp;
 	bool altFlag;
@@ -1088,7 +1088,7 @@
 	_walkFlag = true;
 	altFlag = false;
 
-	switch (hotspotId) {
+	switch (id) {
 	case 997:
 		xp = 169; yp = 146;
 		altFlag = true;
@@ -1103,10 +1103,10 @@
 		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
@@ -2013,7 +2013,7 @@
 	fields.setField(ACTIVE_HOTSPOT_ID, hId);
 
 	if ((hId < PLAYER_ID) || (hotspot->roomNumber == _roomNumber)) {
-		characterWalkingCheck(hotspot);
+		characterWalkingCheck(hotspot->hotspotId);
 	}
 }
 

Modified: scummvm/branches/branch-0-11-0/engines/lure/hotspots.h
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/hotspots.h	2008-01-08 06:18:33 UTC (rev 30340)
+++ scummvm/branches/branch-0-11-0/engines/lure/hotspots.h	2008-01-08 06:20:21 UTC (rev 30341)
@@ -303,7 +303,7 @@
 	HotspotPrecheckResult actionPrecheck(HotspotData *hotspot);
 	BarPlaceResult getBarPlace();
 	bool findClearBarPlace();
-	bool characterWalkingCheck(uint16 hotspotId);
+	bool characterWalkingCheck(uint16 id);
 	bool doorCloseCheck(uint16 doorId);
 	void resetDirection();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.