Jonathan G Rennison
14e0468504
Fix duplicate order duplicating dispatch schedule assignment
2024-06-28 21:41:07 +01:00
Jonathan G Rennison
09a70f6216
Adjust road waypoint check in CmdInsertOrderIntl
2024-06-18 17:28:35 +01:00
Jonathan G Rennison
18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
2024-05-07 17:21:50 +01:00
Jonathan G Rennison
2c63a65b87
Don't first increment start order index in AdvanceOrderIndexDeferred
...
Fixes behaviour of CheckRestartLoadingAtRoadStop
2024-03-20 12:36:50 +00:00
Jonathan G Rennison
1532c96ca7
Add ctrl-click scroll to for non-destination orders
...
Conditional orders on station cargo and show as via orders
2024-03-16 17:32:45 +00:00
Jonathan G Rennison
4200757db3
Scheduled dispatch: Fix handling of missing last/next dispatch times
...
In some cases
2024-03-13 17:34:17 +00:00
Jonathan G Rennison
fe730bce31
Merge branch 'master' into jgrpp
...
# 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
2024-03-12 17:44:28 +00:00
Jonathan G Rennison
0e76f774eb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/landscape.cpp
# src/landscape.h
# src/misc_gui.cpp
# src/newgrf_commons.cpp
# src/order_cmd.cpp
# src/pathfinder/yapf/yapf_base.hpp
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
# src/window.cpp
2024-03-09 21:44:36 +00:00
Tyler Trahan
ab315d0dc9
Fix #12118 : When adding an unbunching order, properly check for unsafe conditions ( #12136 )
2024-03-09 08:28:05 -05:00
SamuXarick
0c432bdc4d
Fix 3947453: GetNextDecisionNode ignored go to nearest depot when combined with stop at depot
2024-03-08 14:31:35 +01:00
Jonathan G Rennison
3a4398b613
Fix signed/unsigned comparison warning
2024-03-02 00:42:08 +00:00
Jonathan G Rennison
a429bddbac
Batch depot order removals when deleting companies
2024-02-26 20:07:36 +00:00
Jonathan G Rennison
93bf033107
Add whether the vehicle is non-front to the vehicle pool pointer tag
...
Add iteration filters which check this
2024-02-25 14:51:59 +00:00
Jonathan G Rennison
05e237f8d1
Add wrapper to iterate vehicle pool with vehicle type filter
...
Without needing to dereference vehicle pointers if using tagged pointers
2024-02-25 14:00:15 +00:00
Jonathan G Rennison
601071744e
Fix timetabled waiting in depots
...
See: #658
2024-02-25 11:50:55 +00:00
Jonathan G Rennison
8581808952
Merge tag '14.0-beta2' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
2024-02-19 03:23:19 +00:00
Jonathan G Rennison
821c5970db
Disallow unbunching if auto-separation, scheduled dispatch or per-cargo full load
2024-02-19 00:13:55 +00:00
Jonathan G Rennison
fdd666f66a
Merge tag '14.0-beta1' into jgrpp
...
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
2024-02-18 22:22:29 +00:00
Tyler Trahan
87a80c7ff2
Change: When adding orders, Ctrl+Click on a depot to unbunch, instead of service if required ( #12023 )
2024-02-18 10:43:44 -05:00
Jonathan G Rennison
a48e15dce0
Add wallclock time settings
2024-02-15 20:31:09 +00:00
Jonathan G Rennison
7ce06e22b8
Split date types into calendar and economy dates
...
See: 735abfe1
2024-02-13 21:34:09 +00:00
Tyler Trahan
771615cb4b
Fix #12020 : Unbunch and service if needed should be mutually exclusive depot order types
2024-02-10 15:11:24 -05:00
Jonathan G Rennison
0ea57528c9
Rename DateTicksScaled to StateTicks
...
Rename various other related/derived types and variables
2024-02-07 18:36:47 +00:00
Tyler Trahan
d0c753465d
Fix f6dd505: Remove unneeded error when switching between depot actions
2024-02-03 17:32:25 -05:00
Tyler Trahan
f6dd5053a3
Feature: Order flag to unbunch vehicles at depot ( #11945 )
2024-02-03 08:04:24 -05:00
frosch
b1718478c8
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
2024-02-02 22:29:28 +01:00
Jonathan G Rennison
9bea1e3cc3
Scheduled dispatch: Allow tagging departure slots, add to conditional order
2024-01-28 17:14:03 +00:00
Jonathan G Rennison
6c329871f1
Scheduled dispatch: Add per dispatch slot flags field
...
Add flag for slot re-use
2024-01-28 01:48:54 +00:00
Jonathan G Rennison
7db457ad80
Use _scaled_date_ticks in ODATFB_NEAREST_DEPOT rate-limiting
2024-01-27 16:40:11 +00:00
Tyler Trahan
fd9e72a7e7
Feature: Use real-time "wallclock" timekeeping units ( #11341 )
2024-01-23 11:36:09 -05:00
Jonathan G Rennison
9be3dfa69c
Scheduled dispatch: Use an invalid value for no last dispatch, not 0
2024-01-22 18:27:28 +00:00
Tyler Trahan
735abfe111
Codechange: Split dates and timers into Economy and Calendar time ( #10700 )
2024-01-22 09:04:34 -05:00
Jonathan G Rennison
5b7689a0aa
Scheduled dispatch: Add flag to re-use all dispatch slots
2024-01-22 01:35:04 +00:00
Jonathan G Rennison
461fe116f2
Tracerestrict: Pass vehicle ptr instead of index to Occupy/Vacate
...
And related functions, to avoid unnecessary vehicle pool lookup
2024-01-20 23:28:03 +00:00
Jonathan G Rennison
041f36d565
Add try to acquire slot order subtype
2024-01-11 21:04:49 +00:00
Jonathan G Rennison
2fc631b15b
Rename OT_RELEASE_SLOT to OT_SLOT, use a subtype field
2024-01-11 19:01:25 +00:00
Jonathan G Rennison
3050620189
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.cpp
# src/economy.cpp
# src/engine_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/newgrf.cpp
# src/newgrf_airporttiles.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/order_base.h
# src/order_cmd.cpp
# src/order_func.h
# src/order_gui.cpp
# src/pathfinder/pathfinder_type.h
# src/saveload/afterload.cpp
# src/subsidy_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
2024-01-11 17:55:16 +00:00
Loïc Guilloux
251008663b
Fix #11748 : Incorrect clamping of negative service interval values ( #11749 )
...
(cherry picked from commit f7bd70baec
2024-01-10 17:44:51 +00:00
Loïc Guilloux
f7bd70baec
Fix #11748 : Incorrect clamping of negative service interval values ( #11749 )
2024-01-10 16:23:36 +01:00
Peter Nelson
400ae65ff2
Codechange: Redefine some cargo-related values in terms of CargoID instead of CargoType.
...
Values used as special filter types are now defined as offsets from NUM_CARGO instead of confusingly reusing CARGO_NO_REFIT/CARGO_AUTO_REFIT types.
2024-01-09 18:56:05 +00:00
Jonathan G Rennison
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
2024-01-07 17:20:41 +00:00
Jonathan G Rennison
107b73c2b8
Merge branch 'master' into jgrpp
2024-01-05 22:57:15 +00:00
SamuXarick
847f3f660d
Fix #10511 : Delay 'go to nearest depot' orders ( #11548 )
...
Delay the nearest depot order search for a day if the vehicle can't find its destination, which happens when it has already attempted to do so and failed to find a valid destination.
2024-01-05 21:23:01 +00:00
Jonathan G Rennison
ea85bbda97
Fix duplicate order not always preserving colour
2024-01-02 19:38:14 +00:00
Jonathan G Rennison
9ea49d6680
Only compile OrderList::DebugCheckSanity when WITH_ASSERT defined
2024-01-02 14:50:33 +00:00
Jonathan G Rennison
03e0ec8276
Strong typedef: Use strong typedefs for date, date tick, minutes types
...
Add delta types
Adjust/add type conversion functions
Add various utility methods on types
Remove the various minute macros
Fix some minute conversion inconsistencies
2023-12-19 02:39:54 +00:00
Jonathan G Rennison
e9599fd4be
Scheduled dispatch: Remove scheduled_dispatch_start_full_date_fract
...
Use DateTicksScaled
2023-12-17 23:00:45 +00:00
Jonathan G Rennison
88670a230f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/articulated_vehicles.cpp
# src/articulated_vehicles.h
# src/base_media_base.h
# src/base_media_func.h
# src/build_vehicle_gui.cpp
# src/dock_gui.cpp
# src/main_gui.cpp
# src/music_gui.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content.cpp
# src/newgrf.cpp
# src/newgrf_roadstop.cpp
# src/os/windows/string_uniscribe.h
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/strings.cpp
# src/terraform_gui.cpp
# src/tests/test_script_admin.cpp
# src/tests/test_window_desc.cpp
# src/timer/timer_game_calendar.h
# src/vehicle.cpp
# src/vehicle_base.h
# src/viewport.cpp
# src/widget_type.h
# src/window.cpp
# src/window_gui.h
2023-11-29 20:42:29 +00:00
Jonathan G Rennison
fc1c47cbd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/crashlog.h
# src/date_type.h
# src/depot_type.h
# src/landscape.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/script/api/script_infrastructure.cpp
# src/stdafx.h
# src/table/settings/gui_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/tests/CMakeLists.txt
2023-11-13 19:08:22 +00:00
Peter Nelson
ab535c0a86
Codechange: Add base() method to StrongType to allow access to the base type without casting. ( #11445 )
...
This removes the ability to explicitly cast to the base type, but the requirement
to use .base() means the conversion is still explicit.
2023-11-06 20:29:35 +00:00
