diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-10-12 22:11:18 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-10-12 22:11:18 +0000 |
| commit | 06a336d53d5793e9cb09cfb9a578673467a7ab88 (patch) | |
| tree | 816e2fa71262bc5f6888f2f8bb7304c917c410f9 | |
| parent | a52285cfd2383fef87aa4692799607c3e239d23f (diff) | |
| download | openttd-06a336d53d5793e9cb09cfb9a578673467a7ab88.tar.xz | |
(svn r6764) -Fix (r6758): Wrong height difference calculated because invalid drag-type
was passed to the function. Thanks peter1138.
| -rw-r--r-- | viewport.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/viewport.c b/viewport.c index 1053c0c21..55ea9214d 100644 --- a/viewport.c +++ b/viewport.c @@ -2294,7 +2294,12 @@ calc_heightdiff_single_direction:; TileIndex t0 = TileVirtXY(sx, sy); TileIndex t1 = TileVirtXY(x, y); uint distance = DistanceManhattan(t0, t1) + 1; - int heightdiff = CalcHeightdiff((_thd.next_drawstyle & HT_DRAG_MASK) | style, 0, t0, t1); + /* With current code passing a HT_LINE style to calculate the height + * difference is enough. However if/when a point-tool is created + * with this method, function should be called with new_style (below) + * instead of HT_LINE | style case HT_POINT is handled specially + * new_style := (_thd.next_drawstyle & HT_RECT) ? HT_LINE | style : _thd.next_drawstyle; */ + int heightdiff = CalcHeightdiff(HT_LINE | style, 0, t0, t1); uint params[2]; params[0] = distance; @@ -2317,12 +2322,12 @@ calc_heightdiff_single_direction:; TileIndex t1 = TileVirtXY(x, y); uint dx = abs(TileX(t0) - TileX(t1)) + 1; uint dy = abs(TileY(t0) - TileY(t1)) + 1; - HighLightStyle style = _thd.next_drawstyle; int heightdiff; uint params[3]; /* If dragging an area (eg dynamite tool) and it is actually a single * row/column, change the type to 'line' to get proper calculation for height */ + style = _thd.next_drawstyle; if (style & HT_RECT) { if (dx == 1) { style = HT_LINE | HT_DIR_Y; |