From a21f72c87bc583b0d2ab6a17f7309e618f1155f5 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Mon, 7 Nov 2011 20:25:14 -0500
Subject: LASTEXPRESS: Fix typos in entity code (as reported by _sev)

---
 engines/lastexpress/entities/abbot.cpp   | 2 +-
 engines/lastexpress/entities/august.cpp  | 2 +-
 engines/lastexpress/entities/mertens.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/lastexpress/entities/abbot.cpp b/engines/lastexpress/entities/abbot.cpp
index c5c6f2a44d..301c52e142 100644
--- a/engines/lastexpress/entities/abbot.cpp
+++ b/engines/lastexpress/entities/abbot.cpp
@@ -841,7 +841,7 @@ IMPLEMENT_FUNCTION(31, Abbot, function31)
 
 	case kActionNone:
 		if (params->param4 != kTimeInvalid && params->param2 < getState()->time) {
-			if (getState()->time < getState()->time) {
+			if (params->param3 < getState()->time) {
 				params->param4 = kTimeInvalid;
 
 				setCallback(1);
diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp
index eb3b09af59..cfde8a2d6f 100644
--- a/engines/lastexpress/entities/august.cpp
+++ b/engines/lastexpress/entities/august.cpp
@@ -2118,7 +2118,7 @@ IMPLEMENT_FUNCTION_II(41, August, function41, CarIndex, EntityPosition)
 		 && getEntities()->isDistanceBetweenEntities(kEntityAugust, kEntityPlayer, 1000)
 		 && !getEntities()->isInsideCompartments(kEntityPlayer)
 		 && !getEntities()->checkFields10(kEntityPlayer)) {
-			if (getData()->car == kCarGreenSleeping || getData()->car == kCarGreenSleeping) {
+			if (getData()->car == kCarGreenSleeping || getData()->car == kCarRedSleeping) {
 				getAction()->playAnimation(kEventAugustMerchandise);
 
 				getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + (750 * (getData()->direction == kDirectionUp ? -1 : 1))), getData()->direction == kDirectionUp);
diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp
index e222af4805..d88962fce2 100644
--- a/engines/lastexpress/entities/mertens.cpp
+++ b/engines/lastexpress/entities/mertens.cpp
@@ -390,7 +390,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
 		break;
 
 	case kActionDefault:
-		if ((!getProgress().eventCorpseFound && !getEvent(kEventMertensAskTylerCompartment) && !getEvent(kEventMertensAskTylerCompartment))
+		if ((!getProgress().eventCorpseFound && !getEvent(kEventMertensAskTylerCompartment) && !getEvent(kEventMertensAskTylerCompartmentD))
 		 || (ENTITY_PARAM(0, 4) && getProgress().jacket == kJacketGreen && !getEvent(kEventMertensDontMakeBed) && !getProgress().eventCorpseThrown))
 			params->param3 = 1;
 
-- 
cgit v1.2.3