dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/elrail.cpp
#	src/ground_vehicle.hpp
#	src/landscape.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnelbridge_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-04-12 19:34:11 +01:00
parent eff2a1669f c6ff7dad68
commit 9521e7ef2b
31 changed files with 775 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pathfinder/npf/npf.cpp
View File

@@ -226,8 +226,8 @@ static uint NPFSlopeCost(AyStarNode *current)
/* Get the height on both sides of the tile edge.
* Avoid testing the height on the tile-center. This will fail for halftile-foundations.
*/
int z1 = GetSlopePixelZ(x1 + dx4, y1 + dy4);
int z2 = GetSlopePixelZ(x2 - dx4, y2 - dy4);
int z1 = GetSlopePixelZ(x1 + dx4, y1 + dy4, true);
int z2 = GetSlopePixelZ(x2 - dx4, y2 - dy4, true);
if (z2 - z1 > 1) {
/* Slope up */

4
src/pathfinder/yapf/yapf_road.cpp
View File

@@ -53,12 +53,12 @@ protected:
/* height of the center of the current tile */
int x1 = TileX(tile) * TILE_SIZE;
int y1 = TileY(tile) * TILE_SIZE;
int z1 = GetSlopePixelZ(x1 + TILE_SIZE / 2, y1 + TILE_SIZE / 2);
int z1 = GetSlopePixelZ(x1 + TILE_SIZE / 2, y1 + TILE_SIZE / 2, true);
/* height of the center of the next tile */
int x2 = TileX(next_tile) * TILE_SIZE;
int y2 = TileY(next_tile) * TILE_SIZE;
int z2 = GetSlopePixelZ(x2 + TILE_SIZE / 2, y2 + TILE_SIZE / 2);
int z2 = GetSlopePixelZ(x2 + TILE_SIZE / 2, y2 + TILE_SIZE / 2, true);
if (z2 - z1 > 1) {
/* Slope up */