From cfac8dbbc6076d9f782e8c406128686f58b428df Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 22 Feb 2015 14:14:30 +0000 Subject: (svn r27160) -Fix: Division of signed values by TILE_SIZE requires cast to stay signed. --- src/smallmap_gui.cpp | 2 +- src/viewport.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 3f9d0582a..ef0f4dd0f 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -847,7 +847,7 @@ void SmallMapWindow::DrawVehicles(const DrawPixelInfo *dpi, Blitter *blitter) co if (v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) continue; /* Remap into flat coordinates. */ - Point pt = this->RemapTile(v->x_pos / TILE_SIZE, v->y_pos / TILE_SIZE); + Point pt = this->RemapTile(v->x_pos / (int)TILE_SIZE, v->y_pos / (int)TILE_SIZE); int y = pt.y - dpi->top; if (!IsInsideMM(y, 0, dpi->height)) continue; // y is out of bounds. diff --git a/src/viewport.cpp b/src/viewport.cpp index 3fc14fcc7..228a67672 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -2569,7 +2569,7 @@ bool ScrollWindowTo(int x, int y, int z, Window *w, bool instant) && y >= 0 && y <= (int)MapSizeY() * (int)TILE_SIZE - 1) { z = GetSlopePixelZ(x, y); } else { - z = TileHeightOutsideMap(x / TILE_SIZE, y / TILE_SIZE); + z = TileHeightOutsideMap(x / (int)TILE_SIZE, y / (int)TILE_SIZE); } } -- cgit v1.2.3-70-g09d2