mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r18962) -Fix (r18958, r18961): Code-style, use this explicitly.

This commit is contained in:
alberth 2010-01-30 15:29:35 +00:00
parent cdc6f5ddc1
commit 815eede0be
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/smallmap_gui.cpp
View File

@ -553,7 +553,7 @@ class SmallMapWindow : public Window {
if (v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) continue; if (v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) continue;
/* Remap into flat coordinates. */ /* Remap into flat coordinates. */
Point pt = RemapTile(v->x_pos / TILE_SIZE, v->y_pos / TILE_SIZE); Point pt = this->RemapTile(v->x_pos / TILE_SIZE, v->y_pos / TILE_SIZE);
int y = pt.y - dpi->top; int y = pt.y - dpi->top;
if (!IsInsideMM(y, 0, dpi->height)) continue; // y is out of bounds. if (!IsInsideMM(y, 0, dpi->height)) continue; // y is out of bounds.
@ -589,7 +589,7 @@ class SmallMapWindow : public Window {
const Town *t; const Town *t;
FOR_ALL_TOWNS(t) { FOR_ALL_TOWNS(t) {
/* Remap the town coordinate */ /* Remap the town coordinate */
Point pt = RemapTile(TileX(t->xy), TileY(t->xy)); Point pt = this->RemapTile(TileX(t->xy), TileY(t->xy));
int x = pt.x - this->subscroll - (t->sign.width_small >> 1); int x = pt.x - this->subscroll - (t->sign.width_small >> 1);
int y = pt.y; int y = pt.y;
@ -696,7 +696,7 @@ class SmallMapWindow : public Window {
/* Which tile is displayed at (dpi->left, dpi->top)? */ /* Which tile is displayed at (dpi->left, dpi->top)? */
int dx; int dx;
Point tile = PixelToTile(dpi->left, dpi->top, &dx); Point tile = this->PixelToTile(dpi->left, dpi->top, &dx);
int tile_x = this->scroll_x / TILE_SIZE + tile.x; int tile_x = this->scroll_x / TILE_SIZE + tile.x;
int tile_y = this->scroll_y / TILE_SIZE + tile.y; int tile_y = this->scroll_y / TILE_SIZE + tile.y;
@ -1032,7 +1032,7 @@ public:
/* While tile is at (delta.x, delta.y)? */ /* While tile is at (delta.x, delta.y)? */
int sub; int sub;
Point pt = PixelToTile(delta.x, delta.y, &sub); Point pt = this->PixelToTile(delta.x, delta.y, &sub);
int x = this->scroll_x + pt.x * TILE_SIZE; int x = this->scroll_x + pt.x * TILE_SIZE;
int y = this->scroll_y + pt.y * TILE_SIZE; int y = this->scroll_y + pt.y * TILE_SIZE;