dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,679 Commits 1 Branch 0 Tags
1e0d5998dbee6b682a59d3fc643c477816d1b966
Commit Graph

303 Commits

Author SHA1 Message Date
Jonathan G Rennison
8c2dd8d7fb Fix handling of LinkGraphOverlay dirty flag 2022-11-10 23:40:13 +00:00
Jonathan G Rennison
2f4f862480 Viewport: Do bounding boxes and link graph/route overlays in threaded part 2022-11-10 20:48:43 +00:00
Jonathan G Rennison
b14e213bd9 Add average travel time to the link graph overlay tooltip 2022-11-06 21:55:14 +00:00
Jonathan G Rennison
0bf1c9bb9d Merge tag '13.0-beta1' into jgrpp 2022-11-05 19:12:42 +00:00
Nicolas Chappe
a43a1902bb Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo 
Passengers usually prefer fast paths to short paths.
Average travel times of links are updated in real-time for use in Dijkstra's algorithm,
and newer travel times weigh more, just like capacities.

(cherry picked from commit 977604ef08)
 2022-11-05 19:07:35 +00:00
Nicolas Chappe
8bf56f39f2 Fix #9708: [Linkgraph] Don't assume vehicles have a non-zero max speed 2022-10-29 18:39:03 +02:00
Nicolas Chappe
c5369caa45 Fix: [Linkgraph] possible rounding errors for travel times of low-capacity links 2022-10-29 18:39:03 +02:00
Nicolas Chappe
25b3ff6423 Cleanup: simplify LinkRefresher::RefreshStats 2022-10-29 18:39:03 +02:00
Jonathan G Rennison
4c01fe2e7f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/russian.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/news_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
 2022-10-19 18:35:35 +01:00
Nicolas Chappe
864771ca09 Feature: [Linkgraph] Show a tooltip with statistics when hovering a link 2022-10-18 22:03:39 +02:00
Jonathan G Rennison
0a9c44d1a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_anim_sse4.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/newgrf_object.h
#	src/road_gui.cpp
#	src/widgets/road_widget.h
#	src/window.cpp
 2022-10-16 20:14:13 +01:00
Bouke Haarsma
c7f55a058b Fix: link overlay line width on HiDPI displays (#10064) 2022-10-04 11:58:58 +02:00
Jonathan G Rennison
7a61b5d820 VarAction2: Cache refit capacity callback results which depend only on cargo 2022-06-06 18:34:30 +01:00
Jonathan G Rennison
dd40fa32df Fix excessive recursion in link graph refresher with conditional order loops 2022-05-12 00:58:31 +01:00
Tyler Trahan
e79724ea22 Feature: Alternative linkgraph colour schemes (#9866) 2022-04-25 19:32:55 +02:00
Jonathan G Rennison
e5a421b65a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/linkgraph/refresh.cpp
#	src/order_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_base.h
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
 2022-03-04 18:17:44 +00:00
Niels Martin Hansen
e68bf58989 Codechange: Use anonymous union for vehicle orders/old orders list 2022-02-15 20:01:10 +01:00
Jonathan G Rennison
29cd07d1c0 Fix aircraft link scale when loading previous savegame versions 
See: #367
 2022-02-04 18:30:22 +00:00
Jonathan G Rennison
f54e19083e Fix crash which could occur when removing invalidated link graph flow. 2022-01-07 17:38:26 +00:00
Jonathan G Rennison
ba824f08c3 Fix re-routing of unrelated cargo when removing invalidated link graph flow 2022-01-04 17:30:41 +00:00
Jonathan G Rennison
89181ea9fd Add setting to increase cost/distance of aircraft linkgraph links 2022-01-02 01:15:54 +00:00
Michael Lutz
13528bfcd0 Codechange: Un-bitstuff all remaining commands. 2021-12-16 22:28:32 +01:00
Michael Lutz
0f64ee5ce1 Codechange: Template DoCommandP to automagically reflect the parameters of the command proc. 
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
 2021-12-16 22:28:32 +01:00
Michael Lutz
549caca39c Codechange: Move command arguments to the back of the networked command function calls. 2021-12-16 22:28:32 +01:00
Jonathan G Rennison
d35b9719a9 Fix redundant declaration of GetLinkGraphJobDesc 2021-11-09 02:13:43 +00:00
Jonathan G Rennison
324e90e5ac Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/lang/english.txt
#	src/lang/greek.txt
#	src/network/core/tcp_connect.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings/gui_settings.ini
#	src/town_cmd.cpp
#	src/widgets/rail_widget.h
 2021-11-02 19:23:24 +00:00
Jonathan G Rennison
1e0bea5b8d Replace FindFirstBit/FindFirstBit64 with a single template function 2021-11-01 23:00:44 +00:00
Jonathan G Rennison
e1e7b67270 Fix cargo mask truncation in CargoMaskValueFilter and LinkRefresher::RefreshLinks 2021-11-01 22:10:03 +00:00
Jonathan G Rennison
f54d69a60a Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini
 2021-11-01 21:18:24 +00:00
Jonathan G Rennison
d1f1a6942a Add support for loading trunk savegames versions 293 - 299 (12.0) 
Use modified upstream saveload implementation for these versions
Re-arrange headers to support multiple saveload implementations
 2021-11-01 18:33:39 +00:00
Jonathan G Rennison
544da99102 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/cargopacket.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraph.h
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.h
#	src/network/network_admin.h
#	src/network/network_func.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/order_base.h
#	src/rail_cmd.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/signs_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/subsidy_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_object.cpp
#	src/settings.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/CMakeLists.txt
#	src/table/settings/settings.ini
#	src/viewport_sprite_sorter_sse4.cpp
 2021-10-18 18:01:27 +01:00
Jonathan G Rennison
fd605e3cf3 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
 2021-09-27 22:47:23 +01:00
Nicolas Chappe
b83820e723 Change: [Linkgraph] Delete links only served by vehicles stopped in depot 
A stale link is not deleted if the link refresher finds a vehicle that still serves it.
This commit excludes vehicles stopped in depot for a very long time from the link refresher,
so that their stale links can be deleted.
 2021-08-20 22:37:03 +02:00
Nicolas Chappe
de28817d9f Fix 977604ef: [Linkgraph] Add a special case for unknown travel times on link update 2021-08-18 01:48:11 +02:00
Nicolas Chappe
977604ef08 Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo 
Passengers usually prefer fast paths to short paths.
Average travel times of links are updated in real-time for use in Dijkstra's algorithm,
and newer travel times weigh more, just like capacities.
 2021-08-17 14:57:59 +02:00
glx22
a543a4b7bb Codechange: Remove FOR_EACH_SET_CARGO_ID 2021-07-09 21:36:09 +02:00
Patric Stout
7b135a8269 Codechange: use SLE_STRUCT(LIST) for Linkgraph chunks 2021-06-14 21:58:05 +02:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings 
See: #267
 2021-06-11 22:54:27 +01:00
Patric Stout
9fff00ba20 Codechange: C++-ify lists for SaveLoad (#9323) 
Basically, this changes "SaveLoad *" to either:
1) "SaveLoadTable" if a list of SaveLoads was meant
2) "SaveLoad &" if a single entry was meant

As added bonus, this removes SL_END / SLE_END / SLEG_END. This
also adds core/span.hpp, a "std::span"-lite.
 2021-05-31 22:26:44 +02:00
rubidium42
6fe4d4ad7b Codechange: linkgraph always iterates with NodeIDs over the Size(), so make Size() the same type to prevent infinite loops 2021-05-27 18:30:56 +02:00
rubidium42
44ca7d9377 Change: Use gender-neutral pronouns 2021-05-15 10:16:48 +02:00
Rubidium
bb9121dbd4 Fix: comparison of narrow type to wide type in loop (potential for infinite loops) 2021-05-15 10:16:10 +02:00
Peter Nelson
ff8d1222d9 Codechange: Use text lines instead of pixel height of font for link graph widgets. 
(cherry picked from commit 56a6f66903)
 2021-05-06 20:11:59 +01:00
Peter Nelson
56a6f66903 Codechange: Use text lines instead of pixel height of font for link graph widgets. 2021-04-30 17:08:15 +01:00
Jonathan G Rennison
b4b3638f1b Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/romanian.txt
 2021-04-14 20:14:13 +01:00
Milek7
4cd9e0f41b Fix: Add virtual destructor to link graph Path. 
Classes derived from Path were freed through base class pointer, but no virtual destructor was present.
 2021-04-13 20:48:49 +02:00
Jonathan G Rennison
5e14b54a0c Merge branch 'master' into jgrpp 2021-04-05 17:51:45 +01:00
Tyler Trahan
de891238d6 Change: Recolour graph windows to brown (#8700) 2021-03-11 15:30:29 +01:00
Jonathan G Rennison
32dcc0d484 Linkgraph: Fix unused expression result warning 2021-03-02 23:45:08 +00:00
Jonathan G Rennison
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
 2021-02-01 17:07:34 +00:00