cpp/openttd-patchpack/source Changeset - r22003:e02d032399fe

Changeset - r22003:e02d032399fe

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 10 years ago 2015-02-22 14:12:34
frosch@openttd.org

(svn r27159) -Codechange: Simplify mapping from smallmap to viewport coordinates by duplicating less code.

1 file changed with 1 insertions and 18 deletions:

src/smallmap_gui.cpp

0 comments (0 inline, 0 general)

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -1387,30 +1387,13 @@ int SmallMapWindow::GetPositionOnLegend( @@
 			_left_button_clicked = false;
 			const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP);
 			Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
 			int sub;
 			pt = this->PixelToTile(pt.x - wid->pos_x, pt.y - wid->pos_y, &sub);
 			pt = RemapCoords(this->scroll_x + pt.x * TILE_SIZE + this->zoom * (TILE_SIZE - sub * TILE_SIZE / 4),
 					this->scroll_y + pt.y * TILE_SIZE + sub * this->zoom * TILE_SIZE / 4, 0);
 			/* correct y coordinate according to the height level at the chosen tile
 			 * - so far we assumed height zero.  Calculations here according to
 			 * TranslateXYToTileCoord in viewport.cpp */
 			Point pt_scaled = {pt.x / (int)(4 * TILE_SIZE), pt.y / (int)(2 * TILE_SIZE)};
 			Point tile_coord = {pt_scaled.y - pt_scaled.x, pt_scaled.y + pt_scaled.x};
 			if (tile_coord.x >= 0 && tile_coord.y >= 0
 				 && tile_coord.x < (int)MapMaxX() && tile_coord.y < (int)MapMaxY()) {
 				int clicked_tile_height = TileHeight(TileXY(tile_coord.x, tile_coord.y));
 				pt.y -= clicked_tile_height * TILE_HEIGHT;
+			}
 			w->viewport->follow_vehicle = INVALID_VEHICLE;
 			w->viewport->dest_scrollpos_x = pt.x - (w->viewport->virtual_width  >> 1);
 			w->viewport->dest_scrollpos_y = pt.y - (w->viewport->virtual_height >> 1);
 			ScrollWindowTo(this->scroll_x + pt.x * TILE_SIZE, this->scroll_y + pt.y * TILE_SIZE, -1, w);
 			this->SetDirty();
 			break;
+		}
 		case WID_SM_ZOOM_IN:

0 comments (0 inline, 0 general)