diff options
| author | D G Turner | 2018-09-24 18:43:35 +0100 |
|---|---|---|
| committer | D G Turner | 2018-09-24 18:43:35 +0100 |
| commit | f1ded1f111e1a194cd14d47db99fec363a8a0478 (patch) | |
| tree | 53844239e5eabcff95f2fad0e42268c7d78a4922 /engines/lastexpress/entities | |
| parent | 638e8442867f0ffd3194fd4527f2af05c8671381 (diff) | |
| download | scummvm-rg350-f1ded1f111e1a194cd14d47db99fec363a8a0478.tar.gz scummvm-rg350-f1ded1f111e1a194cd14d47db99fec363a8a0478.tar.bz2 scummvm-rg350-f1ded1f111e1a194cd14d47db99fec363a8a0478.zip | |
LASTEXPRESS: Fix GCC Warnings
These were for missing parentheses to clarify logical expressions.
Diffstat (limited to 'engines/lastexpress/entities')
| -rw-r--r-- | engines/lastexpress/entities/mertens.cpp | 2 | ||||
| -rw-r--r-- | engines/lastexpress/entities/sophie.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp index cb2311fddd..1140bfabe2 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 cda72bdfff..9136cb21cc 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; } |