Tyler Trahan
6190f48df0
Codechange: Add a DateToYear function instead of dividing each time ( #11173 )
11 months ago
Rubidium
eaae0bb5e7
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
...
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
12 months ago
Jonathan G Rennison
ead18b2af2
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
1 year ago
Jonathan G Rennison
28a764f319
Fix order backup not copying dispatch schedules when not enabled
...
See: #559
1 year ago
Jonathan G Rennison
3cbd1a5a76
Add conditional order test for whether slot is empty/not empty
1 year ago
Jonathan G Rennison
6d483cc5cc
Add toggle to show vehicle route overlay even when window is not focused
1 year ago
Jonathan G Rennison
b089b561a5
Add departure board via order subtype to remove via for prior terminus
1 year ago
Jonathan G Rennison
359fe89d2f
Don't use occupancy of unload and leave empty orders for occupancy average
1 year ago
Jonathan G Rennison
06e0f39aff
Add text label and departure board via orders
1 year ago
Jonathan G Rennison
3b6f7c09ad
Allow changing colour of orders in order list and timetable windows
1 year ago
Jonathan G Rennison
0370f2e3f1
Check that order is station type when comparing with last_station_visited
1 year ago
Jonathan G Rennison
e3e743ba1e
Skip over dummy/invalid orders in destination prediction and auto-separation
1 year ago
Jonathan G Rennison
c9e62ca29b
Only handle each conditional branch once in OrderList::GetNextStoppingStation
1 year ago
Jonathan G Rennison
cbd71b3d58
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/order_cmd.cpp
1 year ago
dP
01ebfad809
Fix 3719f60: Crash when copying non-station orders ( #10540 )
1 year ago
Jonathan G Rennison
2ea1766677
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/league_sl.cpp
# src/saveload/saveload.h
# src/script/api/script_object.hpp
# src/script/squirrel_helper.hpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/table/settings.h.preamble
# src/tree_cmd.cpp
# src/tree_map.h
# src/vehicle.cpp
# src/waypoint_cmd.cpp
1 year ago
Tyler Trahan
3719f60de0
Add: Use specific error message when vehicle cannot go to station/waypoint
1 year ago
Jonathan G Rennison
8d1563a1ed
Various integer width type changes
1 year ago
Jonathan G Rennison
ae9b416684
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/ai/ai_instance.cpp
# src/console_cmds.cpp
# src/engine_type.h
# src/game/game_gui.cpp
# src/game/game_instance.cpp
# src/goal.cpp
# src/goal_cmd.h
# src/lang/english.txt
# src/lang/estonian.txt
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_generic.h
# src/openttd.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_map.h
# src/strings.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/gui_settings.ini
# src/tbtr_template_gui_main.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/water_cmd.cpp
1 year ago
Jonathan G Rennison
483e3172af
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/strong_typedef_type.hpp
# src/gfx.cpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/map_func.h
# src/newgrf_debug_gui.cpp
# src/order_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/tile_type.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
1 year ago
Rubidium
4e65ec1dc4
Codechange: do not declare functions in blocks
1 year ago
rubidium42
6ba55e663e
Codechange: do not hide variables with other variables
1 year ago
Jonathan G Rennison
1bfd96c7f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/3rdparty/fmt/core.h
# src/command_type.h
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/landscape.cpp
# src/network/network.cpp
# src/newgrf_object.h
# src/object_cmd.cpp
# src/order_gui.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_industrytype.cpp
# src/script/api/script_object.hpp
# src/script/api/script_town.cpp
# src/table/object_land.h
# src/timetable_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle_gui.cpp
# src/window.cpp
1 year ago
Rubidium
90f1768006
Codechange: add non-nullptr asserts in cases where it should never be nullptr
...
Though where similar calls are checked for nullptr as in those instances of
the use of that function it can actually return nullptr. In other words, write
down the assumption that the function never returns nullptr in an assert.
1 year ago
Jonathan G Rennison
0310fb0cdc
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/czech.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/order_cmd.cpp
# src/saveload/afterload.cpp
# src/ship.h
# src/vehicle.cpp
2 years ago
Rubidium
375a5b8e3f
Codechange: refactor FindClosestDepot to not use pointers, but return a struct
2 years ago
Jonathan G Rennison
f32733ef22
Command: Replace binary_length field with auxiliary data
...
Use for CMD_ADD_PLAN_LINE
2 years ago
Jonathan G Rennison
7c882b43eb
Fix cloning/copying aircraft with go to nearest hangar orders
2 years ago
Jonathan G Rennison
1364f52405
Fix go to nearest depot orders using the location of a particular depot
2 years ago
Jonathan G Rennison
03a9912a2b
Vehicle list commands now take into account cargo type filter
...
Start/stop
Send to depot type commands
Add to new group
Change order target
2 years ago
Jonathan G Rennison
4990a25e48
Add a "if breakdowns enabled" mode to the no depot order warn setting
2 years ago
Jonathan G Rennison
1ddccee0d7
Fix timetable state conditional order not initing timetable field
2 years ago
Jonathan G Rennison
1518c2fa1e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/depot_type.h
# src/lang/german.txt
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/script/api/script_window.hpp.in
# src/settings_table.cpp
# src/train_cmd.cpp
2 years ago
Jonathan G Rennison
6ac311d71e
Debug: Show type of current order in vehicle debug info
2 years ago
Nicolas Chappe
a9a21e784d
Codechange: Always set the ODATFB_NEAREST_DEPOT flag for 'any depot' orders
2 years ago
Jonathan G Rennison
38c2fa3b66
Add a change counter value special order type
2 years ago
Jonathan G Rennison
91af0c82d3
Adjust CmdModifyOrder p2 bit allocation
2 years ago
Jonathan G Rennison
d61fbb977e
Add order management dropdown, add duplicate order and move jump target
...
Add setting to control if order management button shown
Move order list management to order management dropdown if enabled
See: #439
2 years ago
Jonathan G Rennison
4e8a8a5e0a
Add conditional order to test if last/next dispatch slot is first/last
2 years ago
Jonathan G Rennison
5f511f8a65
Fix incorrect check preventing ordering road vehicles to incompatible depots
2 years ago
Jonathan G Rennison
d3efa2afe0
Show specific reason why vehicle cannot be ordered to a particular station
2 years ago
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
2 years ago
Niels Martin Hansen
e68bf58989
Codechange: Use anonymous union for vehicle orders/old orders list
2 years ago
J0anJosep
d9a37c915f
Cleanup #9725 : Replace cmd_helper related functions and remove cmd_helper.h.
2 years ago
Jonathan G Rennison
c69ed1711d
Allow road vehicle go to station/waypoint orders to have a direction
2 years ago
Jonathan G Rennison
b4fc0b4dc5
Initial implementation of road waypoints
2 years ago
Jonathan G Rennison
e5110bd7f6
Handle service at depot orders in cond order loops
2 years ago
Jonathan G Rennison
e7abf9efb1
Remove unnecessary recursion in GetNextRealStation
2 years ago
Jonathan G Rennison
beb6d01fe8
Improve handling of conditional order waiting loops
...
Do not leave station/depot/waypoint at all if conditional order
loop would result in re-starting waiting/loading
Only actually leave and update timetable at end of loop
Rate-limit loop checks regardless of timetabled wait time
2 years ago
Jonathan G Rennison
904ff6757d
Add slot support to road vehicles, ships and aircraft
2 years ago
Jonathan G Rennison
ce61f6439c
Allow non-train vehicles to test counter values in conditional orders
2 years ago
Jonathan G Rennison
79db533abb
Fix nullptr deref evaluating train in slot conditional order with no slot
...
See: #360
2 years ago
Jonathan G Rennison
b23d394f0b
Handle predictable conditional orders in timetable window
2 years ago
Jonathan G Rennison
543433218c
Ensure that timetable and scheduled dispatch windows redrawn as required
...
Reduce inefficient window and shared order list iteration
2 years ago
Jonathan G Rennison
ff3473fe6a
Add support for multiple scheduled dispatch schedules per order list
2 years ago
Jonathan G Rennison
9e1a78c86e
Clear order wait times when changing to a non-stopping order
2 years ago
Jonathan G Rennison
30817c3915
Fix VRF_BEYOND_PLATFORM_END not being cleared when switching order
3 years ago
Joan Josep
e890e7db76
Cleanup #9725 : Clean up Doxygen docs and fix typo. ( #9753 )
3 years ago
Michael Lutz
21675ec7e2
Codechange: Un-bitstuff vehicle/engine commands.
3 years ago
Michael Lutz
211c630cbe
Codechange: Un-bitstuff order commands.
3 years ago
Michael Lutz
e740c24eb7
Codechange: Template DoCommand 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.
3 years ago
Michael Lutz
7048e1522f
Codechange: Move flags in CommandProc in front of the command arguments.
3 years ago
Michael Lutz
33ca4f2b99
Codechange: Let the compile generate the master command table out of templated command traits.
...
This is using a non-intrusive type-traits like templated system, which
allows compile-time validation that the command table and the command
enum match up.
3 years ago
Michael Lutz
b6933a2ebd
Codechange: Move command arguments to the back of the DoCommand function call.
3 years ago
Jonathan G Rennison
3d4261a33a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/order_cmd.cpp
# src/table/settings/news_display_settings.ini
3 years ago
J0anJosep
d0655a48ba
Fix: Do not redraw vehicle lists when skip order command is tested.
3 years ago
Patric Stout
78eece71d9
Codechange: "set but not used" warning when disabling assert() ( #9613 )
...
DebugCheckSanity() is unused when asserts are disabled. While at it,
use WITH_ASSERT over NDEBUG, as that means we also run this code
during beta/RC.
3 years ago
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
3 years ago
Jonathan G Rennison
0b0d154788
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
3 years ago
rubidium42
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
3 years ago
Jonathan G Rennison
97d5982cb5
Fix various compiler warnings
...
See: #267
3 years ago
rubidium42
2e136285e1
Codechange: move from C-string to std::string for DoCommand
3 years ago
rubidium42
44ca7d9377
Change: Use gender-neutral pronouns
3 years ago
William Davis
879de9781b
Change: Use gender-neutral pronouns in console command messages (and comments) ( #9203 )
...
(cherry picked from commit 881e1da51d
)
3 years ago
William Davis
881e1da51d
Change: Use gender-neutral pronouns in console command messages (and comments) ( #9203 )
3 years ago
Jonathan G Rennison
912c62d749
Add timetable lateness/earliness conditional order
3 years ago
Jonathan G Rennison
f7dcd66f08
Fix unnecessary braking when leaving station with order without non-stop flag
3 years ago
Jonathan G Rennison
8a814bbfe3
Add release slot train order
3 years ago
Jonathan G Rennison
d42ad99688
Add conditional order for current time/date
3 years ago
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
3 years ago
Jonathan G Rennison
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
3 years ago
Jonathan G Rennison
ed0ffb6220
Add feature: realistic train braking
...
Add setting to select train braking model.
3 years ago
Charles Pigott
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
Charles Pigott
860c270c73
Codechange: Replace assert_compile macro with static_assert
4 years ago
glx22
d8605ad18d
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
4 years ago
Jonathan G Rennison
6472f0e203
Fix stack overflows due to excessive recursion updating order destination
...
See: #198
4 years ago
Jonathan G Rennison
b20df78b49
Add feature to append the reverse of an order list
4 years ago
Jonathan G Rennison
9984f39c96
Add feature to reverse the order of an order list
...
See: #120
4 years ago
Jonathan G Rennison
83a128e8a9
Fix stack overflow due to excessive recursion in LinkRefresher
...
Clamp recursion limit to maximum of 64
See: #198
4 years ago
Jonathan G Rennison
e1aca1ab34
Extend Order::flags to 16 bits, fixes conditional order target field size
...
Adjust order packing and CmdInsertOrder
See: #198
4 years ago
Jonathan G Rennison
b9f7db9c7e
Jump counter is no longer a separate field
4 years ago
Jonathan G Rennison
6e17f9bf5d
Use p3 for order indices which don't fit into p1
...
Fix insert/modify order overflowing p1
Don't use text field for change timetable
4 years ago
Jonathan G Rennison
6dd7b2869c
Increase per-vehicle order limit to 64k
...
See: #110
4 years ago
Jonathan G Rennison
bd2649c19e
Avoid unnecessary redrawing of vehicle list windows
...
Redraw info section every tick if values have changed
4 years ago
Jonathan G Rennison
9ee8091ecc
Add conditional order which tests counter value
4 years ago
Jonathan G Rennison
1e0005d7a0
Fix order lookahead changing percent of times conditional order state
4 years ago
Jonathan G Rennison
37683d8f50
Cargo type orders window: Use single command to change all cargoes at once
4 years ago
Jonathan G Rennison
cd093931db
Departure board: Always invalidate boards in DeleteVehicleOrders
4 years ago
Jonathan G Rennison
22b13ffc26
Mark order/timetable windows dirty when changing game date
4 years ago
Jonathan G Rennison
ca79a32890
Scheduled dispatch: Fixup start dates when changing game date
4 years ago