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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/codeql.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	src/map.cpp
#	src/music/midifile.hpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/pbs.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_text.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_func.h
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2024-03-12 17:44:28 +00:00
parent c7d3e291d2 1addeddc07
commit fe730bce31
87 changed files with 3648 additions and 2256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf_canal.cpp
View File

@@ -85,14 +85,14 @@ struct CanalResolverObject : public ResolverObject {
*/
case 0x82: {
uint32_t connectivity =
(!IsWateredTile(TILE_ADDXY(tile, -1, 0), DIR_SW) << 0) // NE
+ (!IsWateredTile(TILE_ADDXY(tile, 0, 1), DIR_NW) << 1) // SE
+ (!IsWateredTile(TILE_ADDXY(tile, 1, 0), DIR_NE) << 2) // SW
+ (!IsWateredTile(TILE_ADDXY(tile, 0, -1), DIR_SE) << 3) // NW
+ (!IsWateredTile(TILE_ADDXY(tile, -1, 1), DIR_W) << 4) // E
+ (!IsWateredTile(TILE_ADDXY(tile, 1, 1), DIR_N) << 5) // S
+ (!IsWateredTile(TILE_ADDXY(tile, 1, -1), DIR_E) << 6) // W
+ (!IsWateredTile(TILE_ADDXY(tile, -1, -1), DIR_S) << 7); // N
(!IsWateredTile(TileAddXY(tile, -1, 0), DIR_SW) << 0) // NE
+ (!IsWateredTile(TileAddXY(tile, 0, 1), DIR_NW) << 1) // SE
+ (!IsWateredTile(TileAddXY(tile, 1, 0), DIR_NE) << 2) // SW
+ (!IsWateredTile(TileAddXY(tile, 0, -1), DIR_SE) << 3) // NW
+ (!IsWateredTile(TileAddXY(tile, -1, 1), DIR_W) << 4) // E
+ (!IsWateredTile(TileAddXY(tile, 1, 1), DIR_N) << 5) // S
+ (!IsWateredTile(TileAddXY(tile, 1, -1), DIR_E) << 6) // W
+ (!IsWateredTile(TileAddXY(tile, -1, -1), DIR_S) << 7); // N
return connectivity;
}