[Scummvm-git-logs] scummvm master -> b3b4b9c8de8bb88b2302835ed081a22a16efe35c

[digitall]

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

Summary:
f1ded1f111 LASTEXPRESS: Fix GCC Warnings
b3b4b9c8de LASTEXPRESS: Fix GCC Enum Comparison Mismatch Warning.


Commit: f1ded1f111e1a194cd14d47db99fec363a8a0478
    https://github.com/scummvm/scummvm/commit/f1ded1f111e1a194cd14d47db99fec363a8a0478
Author: D G Turner (digitall at scummvm.org)
Date: 2018-09-24T18:43:35+01:00

Commit Message:
LASTEXPRESS: Fix GCC Warnings

These were for missing parentheses to clarify logical expressions.

Changed paths:
    engines/lastexpress/entities/mertens.cpp
    engines/lastexpress/entities/sophie.cpp


diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp
index cb2311f..1140bfa 100644
--- a/engines/lastexpress/entities/mertens.cpp
+++ b/engines/lastexpress/entities/mertens.cpp
@@ -588,7 +588,7 @@ IMPLEMENT_FUNCTION_II(13, Mertens, function13, bool, EntityIndex)
 
 		if (!getSoundQueue()->isBuffered(kEntityMertens)) {
 			if (getProgress().chapter == kChapter3 && !params->param1 && getState()->time < kTime2173500 &&
-			 (getState()->time > kTime2106000 || params->param2 != kEntityPlayer && getState()->time > kTime2079000)) {
+			 (getState()->time > kTime2106000 || (params->param2 != kEntityPlayer && getState()->time > kTime2079000))) {
 				// guide guests to the concert
 				if (params->param2 == kEntityAugust)
 					getSound()->playSound(kEntityMertens, "CON3052");
diff --git a/engines/lastexpress/entities/sophie.cpp b/engines/lastexpress/entities/sophie.cpp
index cda72bd..9136cb2 100644
--- a/engines/lastexpress/entities/sophie.cpp
+++ b/engines/lastexpress/entities/sophie.cpp
@@ -70,8 +70,8 @@ IMPLEMENT_FUNCTION_II(2, Sophie, updateEntity, CarIndex, EntityPosition)
 		CarIndex rebeccaCar = getEntityData(kEntityRebecca)->car;
 
 		if (getEntities()->isDistanceBetweenEntities(kEntitySophie, kEntityRebecca, 500)
-		|| (direction == kDirectionUp && (car > rebeccaCar || car == rebeccaCar && position > rebecca_position))
-		|| (direction == kDirectionDown && (car < rebeccaCar || car == rebeccaCar && position < rebecca_position))) {
+		|| (direction == kDirectionUp && (car > rebeccaCar || (car == rebeccaCar && position > rebecca_position)))
+		|| (direction == kDirectionDown && (car < rebeccaCar || (car == rebeccaCar && position < rebecca_position)))) {
 			 getData()->field_49B = 0;
 			 params->param3 = 1;
 		}


Commit: b3b4b9c8de8bb88b2302835ed081a22a16efe35c
    https://github.com/scummvm/scummvm/commit/b3b4b9c8de8bb88b2302835ed081a22a16efe35c
Author: D G Turner (digitall at scummvm.org)
Date: 2018-09-24T19:09:14+01:00

Commit Message:
LASTEXPRESS: Fix GCC Enum Comparison Mismatch Warning.

This was previously comparing the Object Model to the Object Enum.
This has been corrected, but should have no functional change as the
underlying enum value of 1 is identical for both symbols.

Changed paths:
    engines/lastexpress/entities/vassili.cpp


diff --git a/engines/lastexpress/entities/vassili.cpp b/engines/lastexpress/entities/vassili.cpp
index cff6ec4..11a84f5 100644
--- a/engines/lastexpress/entities/vassili.cpp
+++ b/engines/lastexpress/entities/vassili.cpp
@@ -108,7 +108,7 @@ IMPLEMENT_FUNCTION(5, Vassili, chapter1Handler)
 			if (!Entity::updateParameterCheck(params->param3, getState()->time, 450))
 				break;
 
-			if (!params->param2 && getObjects()->get(kObjectCompartmentA).model == kObjectLocation1) {
+			if (!params->param2 && getObjects()->get(kObjectCompartmentA).model == kObjectModel1) {
 				params->param2 = 1;
 				getEntities()->drawSequenceLeft(kEntityVassili, "303A");
 				getObjects()->update(kObjectCompartmentA, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);