71b6d7a502
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/arabic_egypt.txt
# src/station_cmd.cpp
# src/station_cmd.h
# src/timetable_cmd.cpp
# src/train_cmd.cpp
2 years ago
4651ad94fe
Fix: commands with a RoadType in their arguments were not validated properly ( #9944 )
...
Although it was checked that RoadType was not 63 (INVALID_ROADTYPE),
and all values lower than 63 are fine, it also allowed values higher
than 63. As the RoadType is a "byte", it could contain values up
to 255.
2 years ago
57c0ce1270
Fix public roads when traversing level crossings and other non-normal road
2 years ago
8b5b96af77
Fix typos in PostProcessNetworks
3 years ago
c475fb12c0
Add sanity check
3 years ago
7a0150735e
Adjust the cost function again for better bridge and tunnel use
3 years ago
d4fd7f62d1
Build a couple of cycles in the network by connecting each town to the three closest ones in its network
3 years ago
f53ed56200
Increase bridge/tunnel per-tile cost
3 years ago
9683676df1
Use GetTileMaxZ for slope cost check to avoid overly penalising foundations
3 years ago
5e7b8ccd43
Only calculate input points once in IsBlockedByPreviousBridgeOrTunnel
3 years ago
90e75871ad
Fix bridge/tunnel building not using DC_AUTO
...
This could result in existing infrastructure being removed at
the bridge/tunnel far end
3 years ago
724474e435
Use MayTownBuildBridgeType/BSCF_NOT_AVAILABLE_TOWN for bridge type check
3 years ago
96bfcd587b
Fix signedness mismatch warning in tunnel length check
3 years ago
a3d1b916d1
Limit tunnel length at the proper place
3 years ago
3e771dc18d
Revert bug inducing change
3 years ago
b175203d54
Add comment
3 years ago
a73cb99695
Do not build bridges with additional specs
...
Prior to this change, additional bridge sets like modular bridges would be used.
Those might not be suitable for public roads. Those bridges should be left to the player.
3 years ago
198ef11a2b
Force the pathfinder to build serpentine roads
3 years ago
bd41cb618a
Allow using and building trivial foundations
...
(3 corners raised and 2 opposite corners raised)
3 years ago
0f336bba57
Give bridges over the sea a more generous length limit
3 years ago
bfdabf4cb2
Allow building on coast tiles
3 years ago
63534f97bd
Make bridges and tunnels significantly more costly
3 years ago
a6f7478873
Adjust comment for BASE_COST_PER_TILE
3 years ago
d182b0b138
Remove "using namespace std"
3 years ago
1647f9a616
Avoid redundant calls to DistanceManhattan in town_network_distance
3 years ago
e95447edac
Avoid unnecessarily converting lambda to std::function
3 years ago
1732e0a366
Remove trailing whitespace
3 years ago
ac8da77d0b
Fixing a stupid error
3 years ago
35a98fae7d
Try and fix another assertion failure
3 years ago
a6dae1426c
Re-implement the cost function
3 years ago
5d51909c36
Reorganize file
3 years ago
2b1d73cb3d
Fix tunnel glitch
3 years ago
44fe1ca00b
Tweak the bridge generation
3 years ago
a1df69be87
Check for overlaps and intersections of planned bridges and tunnels
3 years ago
1899b1877d
Improve performance even more
3 years ago
7b7b74e21e
Adjust values
3 years ago
b89afbdff3
Reintroduce base cost to make A* admissible
3 years ago
b3044cc482
Improve performance
3 years ago
953be43301
Prevent numeric overflow
3 years ago
af29085e42
Only build bridges over water
3 years ago
8d584990aa
Remove unused hash functions and start the road building from the map center
3 years ago
4542410b41
Revert "Replace original algorithm with a simpler one"
...
This reverts commit 8cb3d80402f626034c08a162b8956dce03eb79f6.
3 years ago
83ea6e9fd8
Replace original algorithm with a simpler one
3 years ago
150e502cf9
Add generation of public roads linking towns
3 years ago
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
3 years ago
b9f3e45af7
Cleanup: Remove unused (and mostly duplicated) function
3 years ago
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
4 years ago
d8a1be48cd
Codechange: Replace vehicle related FOR_ALL with range-based for loops
5 years ago
1f6b3a37f9
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
5 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
Jonathan G Rennison
Patric Stout
Andreas Schmitt
Charles Pigott
glx