diff options
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/script_s1.cpp | 2 | ||||
-rw-r--r-- | engines/agos/zones.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index 145d4a2694..030a4e5d74 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -481,7 +481,7 @@ void AGOSEngine_Simon1::os1_getPathPosn() { } x_diff += y_diff /= 4; - if (x_diff < best_dist || x_diff == best_dist && prev_i == i) { + if ((x_diff < best_dist) || ((x_diff == best_dist) && (prev_i == i))) { best_dist = x_diff; best_i = maxPath + 1 - i; best_j = j; diff --git a/engines/agos/zones.cpp b/engines/agos/zones.cpp index e754baec10..79199c90f1 100644 --- a/engines/agos/zones.cpp +++ b/engines/agos/zones.cpp @@ -197,9 +197,9 @@ void AGOSEngine_Feeble::checkZonePtrs() { uint count = ARRAYSIZE(_vgaBufferPointers); VgaPointersEntry *vpe = _vgaBufferPointers; do { - if (vpe->vgaFile1 < _blockEnd && vpe->vgaFile1End > _block || - vpe->vgaFile2 < _blockEnd && vpe->vgaFile2End > _block || - vpe->sfxFile < _blockEnd && vpe->sfxFileEnd > _block) { + if (((vpe->vgaFile1 < _blockEnd) && (vpe->vgaFile1End > _block)) || + ((vpe->vgaFile2 < _blockEnd) && (vpe->vgaFile2End > _block)) || + ((vpe->sfxFile < _blockEnd) && (vpe->sfxFileEnd > _block))) { vpe->vgaFile1 = NULL; vpe->vgaFile1End = NULL; vpe->vgaFile2 = NULL; @@ -218,8 +218,8 @@ void AGOSEngine::checkNoOverWrite() { vpe = &_vgaBufferPointers[_noOverWrite]; - if (_block <= vpe->vgaFile1 && _blockEnd >= vpe->vgaFile1 || - _vgaMemPtr <= vpe->vgaFile2 && _blockEnd >= vpe->vgaFile2) { + if (((_block <= vpe->vgaFile1) && (_blockEnd >= vpe->vgaFile1)) || + ((_vgaMemPtr <= vpe->vgaFile2) && (_blockEnd >= vpe->vgaFile2))) { _rejectBlock = true; _vgaMemPtr = vpe->vgaFile1 + 0x5000; } else { @@ -232,8 +232,8 @@ void AGOSEngine::checkAnims(uint a) { vpe = &_vgaBufferPointers[a]; - if (_block <= vpe->vgaFile1 && _blockEnd >= vpe->vgaFile1 || - _block <= vpe->vgaFile2 && _blockEnd >= vpe->vgaFile2) { + if (((_block <= vpe->vgaFile1) && (_blockEnd >= vpe->vgaFile1)) || + ((_block <= vpe->vgaFile2) && (_blockEnd >= vpe->vgaFile2))) { _rejectBlock = true; _vgaMemPtr = vpe->vgaFile1 + 0x5000; } else { @@ -245,8 +245,8 @@ void AGOSEngine::checkZonePtrs() { uint count = ARRAYSIZE(_vgaBufferPointers); VgaPointersEntry *vpe = _vgaBufferPointers; do { - if (_block <= vpe->vgaFile1 && _blockEnd >= vpe->vgaFile1 || - _block <= vpe->vgaFile2 && _blockEnd >= vpe->vgaFile2) { + if (((_block <= vpe->vgaFile1) && (_blockEnd >= vpe->vgaFile1)) || + ((_block <= vpe->vgaFile2) && (_blockEnd >= vpe->vgaFile2))) { vpe->vgaFile1 = NULL; vpe->vgaFile2 = NULL; } |