Jonathan G Rennison
9ad2f44ab7
Fix conditional order subtype not being reset when changing to time/date
2023-09-23 16:41:38 +01:00
Jonathan G Rennison
a18f3274b4
Rename close window functions to match upstream
2023-09-15 21:17:25 +01:00
Jonathan G Rennison
02aecca5ae
Conditional order: Replace "next station" with manually set station
2023-08-27 13:47:40 +01:00
Jonathan G Rennison
691e2dcc69
Fix cargo waiting amount via station not being cleared when station deleted
2023-08-27 10:21:46 +01:00
Jonathan G Rennison
c11be37fd9
Add xdata2 field to OrderExtraInfo
2023-08-27 10:03:37 +01:00
Jonathan G Rennison
19835b51ee
Move StationCargoList and FlowStatMap out of GoodsEntry struct
...
Move them into a new GoodsEntryData struct referenced
using a std::unique_ptr from GoodsEntry.
The unique_ptr may be nullptr if the cargo list and flow stat map
are both empty (this is the case for unused cargoes).
This reduces GoodsEntry from 128 to 24 bytes,
and Station from 8680 to 2024 bytes,
(on Linux x86_64).
2023-08-19 21:24:29 +01:00
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
2023-07-02 12:02:36 +01:00
Jonathan G Rennison
28a764f319
Fix order backup not copying dispatch schedules when not enabled
...
See: #559
2023-07-01 03:03:04 +01:00
Jonathan G Rennison
3cbd1a5a76
Add conditional order test for whether slot is empty/not empty
2023-05-21 12:03:22 +01:00
Jonathan G Rennison
6d483cc5cc
Add toggle to show vehicle route overlay even when window is not focused
2023-05-07 11:48:17 +01:00
Jonathan G Rennison
b089b561a5
Add departure board via order subtype to remove via for prior terminus
2023-05-05 17:21:44 +01:00
Jonathan G Rennison
359fe89d2f
Don't use occupancy of unload and leave empty orders for occupancy average
2023-04-09 23:34:29 +01:00
Jonathan G Rennison
06e0f39aff
Add text label and departure board via orders
2023-04-09 12:48:50 +01:00
Jonathan G Rennison
3b6f7c09ad
Allow changing colour of orders in order list and timetable windows
2023-04-08 18:13:35 +01:00
Jonathan G Rennison
0370f2e3f1
Check that order is station type when comparing with last_station_visited
2023-04-03 21:27:20 +01:00
Jonathan G Rennison
e3e743ba1e
Skip over dummy/invalid orders in destination prediction and auto-separation
2023-04-03 21:15:42 +01:00
Jonathan G Rennison
c9e62ca29b
Only handle each conditional branch once in OrderList::GetNextStoppingStation
2023-04-02 01:59:34 +01:00
Jonathan G Rennison
cbd71b3d58
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/order_cmd.cpp
2023-03-05 12:41:58 +00:00
dP
01ebfad809
Fix 3719f60: Crash when copying non-station orders ( #10540 )
2023-03-04 22:52:30 +00:00
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
2023-03-04 16:45:05 +00:00
Tyler Trahan
3719f60de0
Add: Use specific error message when vehicle cannot go to station/waypoint
2023-03-03 17:11:14 -05:00
Jonathan G Rennison
8d1563a1ed
Various integer width type changes
2023-02-15 22:02:23 +00:00
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
2023-02-11 23:05:22 +00:00
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
2023-02-10 17:19:35 +00:00
Rubidium
4e65ec1dc4
Codechange: do not declare functions in blocks
2023-01-29 20:28:45 +01:00
rubidium42
6ba55e663e
Codechange: do not hide variables with other variables
2023-01-29 07:21:34 +01:00
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
2023-01-15 19:28:37 +00:00
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.
2023-01-14 21:15:23 +01:00
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
2023-01-05 23:45:34 +00:00
Rubidium
375a5b8e3f
Codechange: refactor FindClosestDepot to not use pointers, but return a struct
2023-01-04 22:30:48 +01:00
Jonathan G Rennison
f32733ef22
Command: Replace binary_length field with auxiliary data
...
Use for CMD_ADD_PLAN_LINE
2022-12-07 21:14:34 +00:00
Jonathan G Rennison
7c882b43eb
Fix cloning/copying aircraft with go to nearest hangar orders
2022-12-04 21:22:43 +00:00
Jonathan G Rennison
1364f52405
Fix go to nearest depot orders using the location of a particular depot
2022-11-26 18:43:16 +00:00
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
2022-11-19 22:40:29 +00:00
Jonathan G Rennison
4990a25e48
Add a "if breakdowns enabled" mode to the no depot order warn setting
2022-11-17 23:28:57 +00:00
Jonathan G Rennison
1ddccee0d7
Fix timetable state conditional order not initing timetable field
2022-11-17 20:55:11 +00:00
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
2022-11-05 17:19:00 +00:00
Jonathan G Rennison
6ac311d71e
Debug: Show type of current order in vehicle debug info
2022-10-30 14:09:50 +00:00
Nicolas Chappe
a9a21e784d
Codechange: Always set the ODATFB_NEAREST_DEPOT flag for 'any depot' orders
2022-10-22 14:19:08 +02:00
Jonathan G Rennison
38c2fa3b66
Add a change counter value special order type
2022-10-13 20:09:20 +01:00
Jonathan G Rennison
91af0c82d3
Adjust CmdModifyOrder p2 bit allocation
2022-10-12 16:14:59 +01:00
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
2022-10-08 00:46:22 +01:00
Jonathan G Rennison
4e8a8a5e0a
Add conditional order to test if last/next dispatch slot is first/last
2022-07-03 15:49:29 +01:00
Jonathan G Rennison
5f511f8a65
Fix incorrect check preventing ordering road vehicles to incompatible depots
2022-03-29 22:24:34 +01:00
Jonathan G Rennison
d3efa2afe0
Show specific reason why vehicle cannot be ordered to a particular station
2022-03-29 22:14:12 +01: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
J0anJosep
d9a37c915f
Cleanup #9725 : Replace cmd_helper related functions and remove cmd_helper.h.
2022-02-02 21:30:15 +01:00
Jonathan G Rennison
c69ed1711d
Allow road vehicle go to station/waypoint orders to have a direction
2022-01-27 01:30:22 +00:00
Jonathan G Rennison
b4fc0b4dc5
Initial implementation of road waypoints
2022-01-26 21:46:36 +00:00
