diff options
| author | Eugene Sandulenko | 2011-11-03 00:16:25 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-11-03 00:16:25 +0000 |
| commit | 07163c76c938b40dc19212e7bfa19b1d63699d2d (patch) | |
| tree | 591382b931aa4d0f8bf75b0b36d0f9f18cae9b5f /engines/hugo | |
| parent | 558a499a02d7f9e5ff772ad65d18044b6a35486d (diff) | |
| download | scummvm-rg350-07163c76c938b40dc19212e7bfa19b1d63699d2d.tar.gz scummvm-rg350-07163c76c938b40dc19212e7bfa19b1d63699d2d.tar.bz2 scummvm-rg350-07163c76c938b40dc19212e7bfa19b1d63699d2d.zip | |
HUGO: Fix warnings
Diffstat (limited to 'engines/hugo')
| -rw-r--r-- | engines/hugo/route.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/hugo/route.cpp b/engines/hugo/route.cpp index 57c5148dd8..281aacf031 100644 --- a/engines/hugo/route.cpp +++ b/engines/hugo/route.cpp @@ -231,48 +231,48 @@ void Route::segment(int16 x, int16 y) { if (_vm->_hero->x < x1) { // Hero x not in segment, search x1..x2 // Find all segments above current - for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) { + for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) { if (_boundaryMap[y - 1][x] == 0) segment(x, y - 1); } // Find all segments below current - for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) { + for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) { if (_boundaryMap[y + 1][x] == 0) segment(x, y + 1); } } else if (_vm->_hero->x + kHeroMaxWidth > x2) { // Hero x not in segment, search x1..x2 // Find all segments above current - for (x = x2; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x >= x1; x--) { + for (x = x2; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x >= x1; x--) { if (_boundaryMap[y - 1][x] == 0) segment(x, y - 1); } // Find all segments below current - for (x = x2; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x >= x1; x--) { + for (x = x2; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x >= x1; x--) { if (_boundaryMap[y + 1][x] == 0) segment(x, y + 1); } } else { // Organize search around hero x position - this gives // better chance for more direct route. - for (x = _vm->_hero->x; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) { + for (x = _vm->_hero->x; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) { if (_boundaryMap[y - 1][x] == 0) segment(x, y - 1); } - for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x < _vm->_hero->x; x++) { + for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x < _vm->_hero->x; x++) { if (_boundaryMap[y - 1][x] == 0) segment(x, y - 1); } - for (x = _vm->_hero->x; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x <= x2; x++) { + for (x = _vm->_hero->x; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x <= x2; x++) { if (_boundaryMap[y + 1][x] == 0) segment(x, y + 1); } - for (x = x1; !(_routeFoundFl | _fullStackFl | _fullSegmentFl) && x < _vm->_hero->x; x++) { + for (x = x1; !(_routeFoundFl || _fullStackFl || _fullSegmentFl) && x < _vm->_hero->x; x++) { if (_boundaryMap[y + 1][x] == 0) segment(x, y + 1); } |