[Scummvm-cvs-logs] scummvm master -> 6a8d037af1703f6820ae2d42217e2bc8367e46b8

[Littleboy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a8d037af1 LASTEXPRESS: Fix variable shadowing and update comments


Commit: 6a8d037af1703f6820ae2d42217e2bc8367e46b8
    https://github.com/scummvm/scummvm/commit/6a8d037af1703f6820ae2d42217e2bc8367e46b8
Author: Littleboy (littleboy at scummvm.org)
Date: 2012-07-19T17:58:40-07:00

Commit Message:
LASTEXPRESS: Fix variable shadowing and update comments

Changed paths:
    engines/lastexpress/entities/entity.cpp
    engines/lastexpress/entities/entity.h



diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index 743adc3..1ad6d08 100644
--- a/engines/lastexpress/entities/entity.cpp
+++ b/engines/lastexpress/entities/entity.cpp
@@ -254,7 +254,7 @@ void Entity::savegame(const SavePoint &savepoint) {
 	}
 }
 
-void Entity::savegameBloodJacket(SaveFunction *savegame) {
+void Entity::savegameBloodJacket(SaveFunction *saveFunction) {
 	if (getProgress().jacket == kJacketBlood
 	 && getEntities()->isDistanceBetweenEntities(_entityIndex, kEntityPlayer, 1000)
 	 && !getEntities()->isInsideCompartments(kEntityPlayer)
@@ -266,11 +266,11 @@ void Entity::savegameBloodJacket(SaveFunction *savegame) {
 			break;
 
 		case kEntityCoudert:
-			(*savegame)(kSavegameTypeEvent, kEventCoudertBloodJacket);
+			(*saveFunction)(kSavegameTypeEvent, kEventCoudertBloodJacket);
 			break;
 
 		case kEntityMertens:
-			(*savegame)(kSavegameTypeEvent, kEventCoudertBloodJacket);
+			(*saveFunction)(kSavegameTypeEvent, kEventCoudertBloodJacket);
 			break;
 		}
 	}
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index f29d78e..5ba78ab 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -696,9 +696,11 @@ protected:
 	void savegame(const SavePoint &savepoint);
 
 	/**
-	 * Saves the game before being found out with a blood covered jacket
+	 * Saves the game before being found out with a blood covered jacket.
+	 *
+	 * @param	saveFunction	The setup function to call to save the game
 	 */
-	void savegameBloodJacket(SaveFunction *savegame);
+	void savegameBloodJacket(SaveFunction *saveFunction);
 
 	/**
 	 * Play sound
@@ -826,7 +828,7 @@ protected:
 	 * @param	positionTo			  	The position to.
 	 * @param	sequenceTo			  	The sequence to.
 	 * @param	enterFunction			The enter/exit compartment function.
-	 * @param	enterFunction			The update entity function.
+	 * @param	updateFunction			The update entity function.
 	 */
 	void goToCompartmentFromCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, ObjectIndex compartmentTo, EntityPosition positionTo, Common::String sequenceTo, Entity::EnterFunction *enterFunction, Entity::UpdateFunction *updateFunction);