dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,410 Commits 1 Branch 0 Tags
ca23e319861752f368cf13fd065a7b34df5fd188
Commit Graph

298 Commits

Author SHA1 Message Date
Jonathan G Rennison
ca23e31986 Add railtype variable for adjacent crossing information 2023-11-26 17:29:27 +00:00
Jonathan G Rennison
38df621e62 Improve train speed adaptation with realistic braking 
Take into account recorded speeds at signals along the reservation
As noted in the lookahead

See: #613
 2023-11-25 00:23:27 +00:00
Jonathan G Rennison
3f90910bb8 Show train speed adaptation info in debug window 2023-11-23 18:19:18 +00:00
Jonathan G Rennison
0d4d4a9cac Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h
 2023-11-20 22:27:05 +00:00
Jonathan G Rennison
c929f7075e Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/SourceList.cmake
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_base.h
#	src/elrail.cpp
#	src/network/core/udp.cpp
#	src/network/network_admin.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_storage.h
#	src/os/unix/crashlog_unix.cpp
#	src/rail.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/road_map.h
#	src/saveload/labelmaps_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/settings/world_settings.ini
#	src/tests/test_script_admin.cpp
#	src/textfile_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
 2023-11-19 13:00:21 +00:00
Jonathan G Rennison
6708a886ac Debug: Show current order and load times in vehicle debug info 2023-11-13 20:58:43 +00:00
Patric Stout
e5673a1756 Codechange: cleanup CargoPacket in terms of variable/function names (#11278) 
Over the years, things got reused and changed, making the current
names somewhat unclear in what they actually mean and do.

(cherry picked from commit 30172fc037)
 2023-10-01 23:40:38 +01:00
Joan Josep
6b7537646d Fix: Allow NewGRF inspection of road tiles. (#11323) 2023-09-20 22:54:34 +01:00
Joan Josep
b9a1cb5d7c Fix: Spelling of NIHAirport. (#11322) 2023-09-20 20:22:37 +02:00
frosch
b6c8f301be Codechange: Silence warnings about intentionally unused parameters. 2023-09-19 22:49:59 +02:00
Michael Lutz
5cc623cb3c Add: [NewGRF] Inspection window for airports. 
As as the station window combines all station types, accessing the
debug view is via the parent of the airport tile only.

(cherry picked from commit a6f2f3c042)
 2023-09-10 20:50:57 +01:00
Michael Lutz
a6f2f3c042 Add: [NewGRF] Inspection window for airports. 
As as the station window combines all station types, accessing the
debug view is via the parent of the airport tile only.
 2023-09-10 19:38:18 +02:00
Jonathan G Rennison
f6eadf19c6 Replace vehicle tile hash 
Use robin hood hash of TileIndex
Retain linked list of vehicles on the same tile
 2023-09-10 16:19:19 +01:00
Jonathan G Rennison
a0e3885acc Add airport tile variables to get airport type local ID and layout 2023-08-26 15:01:10 +01:00
Jonathan G Rennison
e72744cc77 Debug: Show airport type/layout in debug window 2023-08-26 14:11:54 +01:00
Jonathan G Rennison
1eb1b0ffcb Debug: Show cargo packet info if cargo is reserved 2023-08-23 21:29:01 +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
c7712bbd20 Debug: Shpw station GoodsEntry info in station debug window 2023-08-18 23:13:30 +01:00
Jonathan G Rennison
2ae4e5bdc1 Change road vehicle path cache to be optional and use ring buffers 
Show path cache in debug window
 2023-08-16 15:17:56 +01:00
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
 2023-07-19 19:30:14 +02:00
Jonathan G Rennison
8af0dc223c Debug: Improve display of rail/road/tram type labels 
Click to show individual compatible/powered types
 2023-07-18 22:54:55 +01:00
Jonathan G Rennison
dadebfa759 Debug: Show engine cargo/refit values 2023-06-18 10:05:48 +01:00
Jonathan G Rennison
051cb29f7a Debug: Show engine misc flags for all vehicle types 2023-06-18 10:05:29 +01:00
Jonathan G Rennison
02549c5224 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp
 2023-06-08 00:01:38 +01:00
Jonathan G Rennison
bc00753996 NewGRF stations: Remove extended version of varuiable 68 2023-06-06 21:35:39 +01:00
Jonathan G Rennison
3d4133cadb Debug: Fix debug window parent scope button with missing town 2023-06-02 22:18:40 +01:00
Jonathan G Rennison
e3bd8966fc Debug: Allow setting parameters for extended vars in debug window 
Reafctor handling of set parameters
 2023-06-01 20:36:00 +01:00
Jonathan G Rennison
bdb9a72aa4 NewGRF: Add/extend station variables for station info of nearby tiles 
In preparation for support of more than 255 stations per GRF
 2023-06-01 18:51:51 +01:00
Jonathan G Rennison
1dbbbed9e5 NewGRF: Only extend value of road stops variable 68 if feature tested for 2023-06-01 18:14:23 +01:00
Jonathan G Rennison
02fe4af934 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
 2023-05-30 00:49:24 +01:00
PeterN
584faaf064 Change: Reorganise industry accept/produce arrays. (#10853) 
Use a array of struct for each cargo instead of an array for each statistic.
This makes iterating for acceptance and production much simpler.
pct_transported is now calculated when needed.
 2023-05-25 21:25:46 +01:00
Peter Nelson
e6740046ee Codechange: Use range-for iteration. 2023-05-11 07:58:55 +01:00
Jonathan G Rennison
f78fea4fbf Debug: Add introduction info to railtype debug info 2023-05-04 17:04:28 +01:00
Jonathan G Rennison
64925aedf8 Add town variable for town tile X and Y coordinates 2023-04-13 21:19:53 +01:00
Jonathan G Rennison
9fd01d57cc Rename town zone extended variable identifiers 2023-04-13 20:53:11 +01:00
Jonathan G Rennison
ac0c8c8cdd Debug: Show local GRF IDs for engines, stations, houses, objects and road stops 2023-04-13 20:48:59 +01:00
Jonathan G Rennison
1d947201d3 Debug: Fix expand/collapse for extra engine flags 2023-04-13 19:59:28 +01:00
Jonathan G Rennison
1d05637d45 Add setting for rail depot maximum speed 2023-04-06 01:30:14 +01:00
Jonathan G Rennison
e02585f68e Add railtype and signals variables for signal vertical clearance 2023-04-04 20:29:22 +01:00
Jonathan G Rennison
d30157a113 Debug: Show whether vehicle needs service in debug window 2023-03-24 11:44:58 +00:00
Jonathan G Rennison
5d5e005c5d Debug: Log aircraft target airport and movement state name 2023-03-22 21:15:46 +00:00
Jonathan G Rennison
bd3df161e4 Debug: Show whether vehicle is in tile hash in debug info 2023-03-22 19:38:53 +00:00
Jonathan G Rennison
0ab54b2992 Debug: Fix aliasing of show/hide toggles for aircraft in debug window 2023-03-22 19:38:53 +00:00
Jonathan G Rennison
1dce4a0bef Debug: Show reliability/breakdown values in vehicle debug window 2023-03-15 19:44:26 +00:00
Jonathan G Rennison
9c5f81790a Debug: Split industry produced cargo info across multiple lines 2023-03-12 13:35:37 +00:00
Jonathan G Rennison
ae99f667b0 NewGRF: Add generic town callback to set town zone radii 2023-03-11 22:23:40 +00:00
Jonathan G Rennison
93c34775e4 NewGRF: Add town variables for uncapped house count, population and zone radii 
Add feature name
 2023-03-11 22:23:40 +00:00
Jonathan G Rennison
4c1406a4b5 Add: NewGRF road stops 2023-02-26 21:28:30 +01:00
Jonathan G Rennison
e0a42b5945 Debug: Add dumping of rail and road/tram sprite groups 2023-02-25 16:16:49 +00:00
Jonathan G Rennison
5a877b49b4 Add railtype/signal variable to get signal side 2023-02-19 20:22:40 +00:00