diff options
| author | Robin Watts | 2008-11-29 18:01:16 +0000 |
|---|---|---|
| committer | Robin Watts | 2008-11-29 18:01:16 +0000 |
| commit | 8f3b2e9b4d9f1f82682e1eed018153091cddee9f (patch) | |
| tree | f2af64fa467e70a3ba25e9c615baa053e0818d88 /engines/agos/zones.cpp | |
| parent | 362bdf87d78f611f3e308e7e9234831208b93d68 (diff) | |
| download | scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.tar.gz scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.tar.bz2 scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.zip | |
Remove warnings from NDS build.
svn-id: r35172
Diffstat (limited to 'engines/agos/zones.cpp')
| -rw-r--r-- | engines/agos/zones.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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; } |