diff options
| author | Strangerke | 2014-03-02 11:43:46 +0100 |
|---|---|---|
| committer | Strangerke | 2014-03-02 11:43:46 +0100 |
| commit | 418de45d9cebfbabb05edd09ca5206d95d693867 (patch) | |
| tree | 15962f9701061ee0a19488760f67cb96216854a7 /engines/toltecs | |
| parent | fd995fa44914e393fe5dc725928af2a297846513 (diff) | |
| download | scummvm-rg350-418de45d9cebfbabb05edd09ca5206d95d693867.tar.gz scummvm-rg350-418de45d9cebfbabb05edd09ca5206d95d693867.tar.bz2 scummvm-rg350-418de45d9cebfbabb05edd09ca5206d95d693867.zip | |
TOLTECS: Reduce a variable scope, move a variable to boolean
Diffstat (limited to 'engines/toltecs')
| -rw-r--r-- | engines/toltecs/microtiles.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/toltecs/microtiles.cpp b/engines/toltecs/microtiles.cpp index 63490ec221..0ac04905cb 100644 --- a/engines/toltecs/microtiles.cpp +++ b/engines/toltecs/microtiles.cpp @@ -118,10 +118,7 @@ Common::Rect * MicroTileArray::getRectangles(int *num_rects, int min_x, int min_ for (y = 0; y < _tilesH; ++y) { for (x = 0; x < _tilesW; ++x) { - int finish = 0; - BoundingBox boundingBox; - - boundingBox = _tiles[i]; + BoundingBox boundingBox = _tiles[i]; if (isBoundingBoxEmpty(boundingBox)) { ++i; @@ -139,6 +136,7 @@ Common::Rect * MicroTileArray::getRectangles(int *num_rects, int min_x, int min_ // FIXME: Why is the following code in an #if block? #if 1 if (TileX1(boundingBox) == TileSize - 1 && x != _tilesW - 1) { // check if the tile continues + bool finish = false; while (!finish) { ++x; ++i; @@ -150,13 +148,12 @@ Common::Rect * MicroTileArray::getRectangles(int *num_rects, int min_x, int min_ { --x; --i; - finish = 1; + finish = true; } } } #endif x1 = (x * TileSize) + TileX1(_tiles[i]); - x1 = CLIP (x1, min_x, max_x); // FIXME: Why is the following code in an #if block? |