miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.8.0

Browse Source
This commit is contained in:
Pavel Stupnikov
2018-04-06 22:08:52 +03:00
parent 81825b763a 42ec3bd611
commit 329f52d34e
224 changed files with 2404 additions and 1791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/viewport.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: viewport.cpp 27344 2015-07-28 08:16:52Z alberth $ */
/* $Id: viewport.cpp 27893 2017-08-13 18:38:42Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -2769,8 +2769,8 @@ static int CalcHeightdiff(HighLightStyle style, uint distance, TileIndex start_t
byte style_t = (byte)(TileX(end_tile) > TileX(start_tile));
start_tile = TILE_ADD(start_tile, ToTileIndexDiff(heightdiff_area_by_dir[style_t]));
end_tile = TILE_ADD(end_tile, ToTileIndexDiff(heightdiff_area_by_dir[2 + style_t]));
/* FALL THROUGH */
}
FALLTHROUGH;
case HT_POINT:
h0 = TileHeight(start_tile);
@@ -3402,7 +3402,7 @@ void VpSelectTilesWithMethod(int x, int y, ViewportPlaceMethod method)
case VPM_X_LIMITED: // Drag in X direction (limited size).
limit = (_thd.sizelimit - 1) * TILE_SIZE;
/* FALL THROUGH */
FALLTHROUGH;
case VPM_FIX_X: // drag in Y direction
x = sx;
@@ -3411,7 +3411,7 @@ void VpSelectTilesWithMethod(int x, int y, ViewportPlaceMethod method)
case VPM_Y_LIMITED: // Drag in Y direction (limited size).
limit = (_thd.sizelimit - 1) * TILE_SIZE;
/* FALL THROUGH */
FALLTHROUGH;
case VPM_FIX_Y: // drag in X direction
y = sy;
@@ -3434,7 +3434,7 @@ calc_heightdiff_single_direction:;
limit = (_thd.sizelimit - 1) * TILE_SIZE;
x = sx + Clamp(x - sx, -limit, limit);
y = sy + Clamp(y - sy, -limit, limit);
/* FALL THROUGH */
FALLTHROUGH;
case VPM_X_AND_Y: // drag an X by Y area
if (_settings_client.gui.measure_tooltip || _thd.select_proc == DDSP_MEASURE) {