Commit Graph

29 Commits

Author SHA1 Message Date
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
Peter Nelson
952d111b94 Codechange: Split CT_INVALID into CT_INVALID and INVALID_CARGO.
INVALID_CARGO is a CargoID and should be used for most purposes in game.
CT_INVALID is a CargoType used for defining default properties.
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
7f6b1d6b94 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
2024-01-05 13:37:52 +00:00
Rubidium
e3f49ee7a0 Codechange: coding style fixes 2024-01-04 16:23:54 +01:00
frosch
b6c8f301be Codechange: Silence warnings about intentionally unused parameters. 2023-09-19 22:49:59 +02: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
1dbbbed9e5 NewGRF: Only extend value of road stops variable 68 if feature tested for 2023-06-01 18:14:23 +01:00
Peter Nelson
0b72297d57 Feature: Increase number of stations/roadstops per NewGRF. 2023-05-05 07:08:40 +01:00
PeterN
9910240f0e Cleanup: Remove obsolete (Make)EnumPropsT. (#10697)
This was used by the command system to help extract p1/p2 parameters, which no longer happens.
2023-04-23 17:46:14 +01:00
Jonathan G Rennison
62053779b5 Road stops: Add flag to read draw mode from register 0x100 2023-04-02 13:11:11 +01:00
Jonathan G Rennison
2e7545f85f Road stops: Add flag to use custom graphics for disabled views in build window 2023-03-19 11:01:17 +00:00
Jonathan G Rennison
5718730d68 VarAction2: Add support for more varaction2 types
Add CB failure and deterministic relative types
2023-03-15 19:44:26 +00:00
Jonathan G Rennison
4c1406a4b5 Add: NewGRF road stops 2023-02-26 21:28:30 +01:00
Jonathan G Rennison
dceafaf2db GRF: Initial support for > 255 road stop specs per GRF
Add new variable for road stop info of nearby tiles
Bump roadstops version
2023-02-12 20:35:18 +00:00
Jonathan G Rennison
1272bec13b Road stops: Add height property for build window preview 2023-02-05 17:40:14 +00:00
Jonathan G Rennison
8020f6d481 Add road stop flags to only show in the road or tram build menus 2022-11-13 16:36:55 +00:00
Jonathan G Rennison
50965bbce7 Add road stops flag to disable auto road connections
Bump road stops version
2022-08-28 23:53:26 +01:00
Jonathan G Rennison
8a9afd4621 Add road stops flag for drive-through stops only 2022-04-15 17:46:42 +01:00
Jonathan G Rennison
ad0dc6dc87 Add road stops flag to disable drawing catenary 2022-04-15 11:47:57 +01:00
Jonathan G Rennison
e24d7c88bc Add road stop flag to not show one-way road overlays 2022-02-25 12:42:32 +00:00
Jonathan G Rennison
cb573a1523 Add road stop property to set cost multipliers 2022-02-24 21:13:46 +00:00
Jonathan G Rennison
ad046bdf22 Add a waypoint ground draw flag to NewGRF road stops
Adjust overlay draw conditions
2022-02-24 18:20:09 +00:00
Jonathan G Rennison
742b42cff6 Remove unused road stop constant 2022-02-17 18:48:01 +00:00
Jonathan G Rennison
650a359a16 Fix road stop road/tram type variables when not present and in GUI 2022-02-16 19:03:41 +00:00
Jonathan G Rennison
2cbbae16da Add roadstop GRF properties to set bridge heights and disallowed pillars 2022-02-15 18:21:32 +00:00
Jonathan G Rennison
23c472d2a0 Add support for road stop animation, availability callback
Add animation, callback mask, general flags properties
Add animation frame variables
2022-02-15 00:22:18 +00:00
Jonathan G Rennison
a69eba31fe Implement NewGRF road stop root sprite group selection 2022-02-14 00:31:14 +00:00
Jonathan G Rennison
1084bb8566 Initial support for NewGRF road stops (bus and lorry stops) 2022-02-14 00:31:14 +00:00