aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorLittleboy2012-07-16 23:56:35 -0400
committerLittleboy2012-07-19 20:58:40 -0400
commit6a8d037af1703f6820ae2d42217e2bc8367e46b8 (patch)
treeed3d27da760c9cb9b6478992e42abb0e42589f9b /engines
parente160f62ade8821a507e5d07551751a1a75308a53 (diff)
downloadscummvm-rg350-6a8d037af1703f6820ae2d42217e2bc8367e46b8.tar.gz
scummvm-rg350-6a8d037af1703f6820ae2d42217e2bc8367e46b8.tar.bz2
scummvm-rg350-6a8d037af1703f6820ae2d42217e2bc8367e46b8.zip
LASTEXPRESS: Fix variable shadowing and update comments
Diffstat (limited to 'engines')
-rw-r--r--engines/lastexpress/entities/entity.cpp6
-rw-r--r--engines/lastexpress/entities/entity.h8
2 files changed, 8 insertions, 6 deletions
diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index 743adc3201..1ad6d08035 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 f29d78e181..5ba78abc17 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);