diff options
| -rw-r--r-- | dists/msvc9/create_msvc9.bat | 8 | ||||
| -rw-r--r-- | engines/toltecs/microtiles.cpp | 9 | ||||
| -rw-r--r-- | engines/tsage/scenes.cpp | 1 |
3 files changed, 8 insertions, 10 deletions
diff --git a/dists/msvc9/create_msvc9.bat b/dists/msvc9/create_msvc9.bat index 34bcccdd7b..61a9ea8bf8 100644 --- a/dists/msvc9/create_msvc9.bat +++ b/dists/msvc9/create_msvc9.bat @@ -55,28 +55,28 @@ goto done echo. echo Creating project files with all engines enabled (stable and unstable) echo. -create_project ..\.. --enable-all-engines --msvc --msvc-version 9 +create_project ..\.. --enable-all-engines --msvc --msvc-version 9 --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision goto done :stable echo. echo Creating normal project files, with only the stable engines enabled echo. -create_project ..\.. --msvc --msvc-version 9 +create_project ..\.. --msvc --msvc-version 9 --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision goto done :tools echo. echo Creating tools project files echo. -create_project ..\.. --tools --msvc --msvc-version 9 +create_project ..\.. --tools --msvc --msvc-version 9 --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision goto done :tests echo. echo Creating tests project files echo. -create_project ..\.. --tests --msvc --msvc-version 9 +create_project ..\.. --tests --msvc --msvc-version 9 --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision goto done :clean_check 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? diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 80ce1e3ecc..d0150dc4b1 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -150,6 +150,7 @@ void SceneManager::fadeInIfNecessary() { void SceneManager::changeScene(int newSceneNumber) { debug(1, "changeScene(%d)", newSceneNumber); + warning("Scene %d", newSceneNumber); // Fade out the scene ScenePalette scenePalette; |