10e35ca8e4
Codechange: let NewGRF make use of SpriteFile instead of most of the FIO slot functions
3 years ago
fdc11a9f94
Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality
3 years ago
c097bc9d7d
Codechange: let NewGRF sounds make use of RandomAccessFile instead of the FIO slot functions
3 years ago
01d40812fa
Codechange: Validate custom station platform layout tiles are permitted values only.
...
(cherry picked from commit 756034fa27
3 years ago
da571d6481
Codechange: Use std::vector for NewGRF station tile sprite layouts.
...
(cherry picked from commit a3e49178d1
3 years ago
72bc8c7595
Codechange: Use std::vector for NewGRF station platform layouts.
...
This avoids the need to custom memory management and additional members.
This also resolves use-after-free if modifying copied layouts, so presumably nobody has ever done that.
(cherry picked from commit bd1a20f6ee
3 years ago
0b4d45af93
Codechange: Warn if randomaction2 group count is not a power of 2.
...
Previously noted by a comment, this does not need to be guarded against as non-powers of 2 will not cause issues beyond the choice of results being reduced.
(cherry picked from commit 18fb1c3866
3 years ago
f5722a999e
Cleanup: Use std::vector in RandomSpriteGroup.
...
(cherry picked from commit 913d8a7f28
3 years ago
a69a1d19a9
Cleanup: Use std::vector in DeterministicSpriteGroup.
...
(cherry picked from commit 1aeaf39954
3 years ago
d3b9d19c5a
Cleanup: Use std::vector in RealSpriteGroup.
...
(cherry picked from commit f785a70a2b
3 years ago
050b95e351
Codechange: Replace FOR_ALL_CARGOSPECS with range-based for loops
...
(cherry picked from commit 9a8756d7ed
3 years ago
756034fa27
Codechange: Validate custom station platform layout tiles are permitted values only.
3 years ago
a3e49178d1
Codechange: Use std::vector for NewGRF station tile sprite layouts.
3 years ago
bd1a20f6ee
Codechange: Use std::vector for NewGRF station platform layouts.
...
This avoids the need to custom memory management and additional members.
This also resolves use-after-free if modifying copied layouts, so presumably nobody has ever done that.
3 years ago
18fb1c3866
Codechange: Warn if randomaction2 group count is not a power of 2.
...
Previously noted by a comment, this does not need to be guarded against as non-powers of 2 will not cause issues beyond the choice of results being reduced.
3 years ago
913d8a7f28
Cleanup: Use std::vector in RandomSpriteGroup.
3 years ago
1aeaf39954
Cleanup: Use std::vector in DeterministicSpriteGroup.
3 years ago
f785a70a2b
Cleanup: Use std::vector in RealSpriteGroup.
3 years ago
9a8756d7ed
Codechange: Replace FOR_ALL_CARGOSPECS with range-based for loops
3 years ago
6a62b94263
Add NewGRF railtype flag to disable realistic braking for vehs of that type
...
See: #242
3 years ago
f39b6f4ba3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/genworld_gui.cpp
# src/landscape.cpp
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/screenshot.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings.ini
# src/tile_type.h
# src/widgets/genworld_widget.h
3 years ago
83ac5aa27a
Fix: Memory leak of airport tile layout in AirportChangeInfo (prop 0A) ( #8928 )
3 years ago
7ae5e5b89f
Fix memory leak of airport tile layout in AirportChangeInfo
3 years ago
1a1049bc0d
Change: rename setting "max_heightlevel" to "map_height_limit"
...
This better reflects what it is, and hopefully removes a bit of
the confusion people are having what this setting actually does.
Additionally, update the text on the setting to better inform
users what it is doing exactly, so they can make an educated
decision on how to change it.
Next commit will introduce an "auto" value, which should be the
new default. The rename has as added benefit that everyone will
start out on the "auto" value.
3 years ago
2e20da40ed
Cache current value of snow line height
3 years ago
1c1d272b57
Merge branch 'master' into jgrpp
3 years ago
8157af6d68
Fix #8276 : Crash when a NewGRF object's size was not set
3 years ago
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
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
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
3 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
3 years ago
e94656b5a5
Fix: [NewGRF] Action 7/9 conditions 0x0F to 0x12 failed, if 'param' was 0x88. ( #8382 )
...
Fix: [NewGRF] Action 7/9 conditions 0x0B to 0x12 failed, if 'param' was 0x85.
These conditions are supposed to ignore 'param' entirely.
(cherry picked from commit d5f05fb781
3 years ago
860c270c73
Codechange: Replace assert_compile macro with static_assert
3 years ago
1478fa93b3
Add: [NewGRF] Patch flag to test if inflation is on or off.
3 years ago
d5f05fb781
Fix: [NewGRF] Action 7/9 conditions 0x0F to 0x12 failed, if 'param' was 0x88. ( #8382 )
...
Fix: [NewGRF] Action 7/9 conditions 0x0B to 0x12 failed, if 'param' was 0x85.
These conditions are supposed to ignore 'param' entirely.
4 years ago
79240eab1e
Codechange: Make use of the improved C++17 emplace_back function.
4 years ago
e51c585f45
GRF: Fix rail/road type reservation phase with extended properties
4 years ago
75a964acb0
GRF: Add extra road/tram type flag: not available to AI/GS
4 years ago
14adcbac80
Add NewGRF bridge property to prevent town or AI/GS building bridge type
4 years ago
b6f583a799
GRF: Add railtype custom signal sprite restricted flag, and control flag
4 years ago
d32672a325
GRF: Allow railtype custom signal sprites for programmable pre-signals
4 years ago
810bfd276e
Add several NewGRF variables to vehicle image callback whitelist
...
Add vehicle flags to control cached image invalidation
Various refactorings
4 years ago
53f9fa139d
Remove redundant year/month date globals
4 years ago
43c538fa7d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/town_cmd.cpp
4 years ago
1507902d00
Codechange: remove has_newindustries global
4 years ago
a82572d0f5
Codechange: remove has_newhouses global
4 years ago
677940cfc6
Merge branch 'master' into jgrpp
4 years ago
f827bc8c1a
Fix #8166 : don't crash on loading an invalid roadtype newgrf
...
Initialization code for GRFFile::roadtype_map was copied from
railtype_map. But while RailType is a byte-sized enum and could thus
be initialized via memset, RoadType doesn't have a defined size.
4 years ago
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
4 years ago
9c2e47d03c
Codechange: Use std::string for storing GRF error messages.
4 years ago
c082f570ce
Codechange: Use std::string when translating TTDP NewGRF string codes.
4 years ago
43cd892e0c
Codechange: Replace custom linked list for GRF texts with STL vectors and strings.
4 years ago
f2b40f40aa
Codechange: Replace SmallPair with std::pair.
...
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
4 years ago
81a1094cc8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/date.cpp
# src/economy.cpp
# src/misc.cpp
# src/newgrf_house.cpp
4 years ago
c8779fb311
Feature: NewGRF callback profiling ( #7868 )
...
Adds a console command newgrf_profile to collect some profiling data about NewGRF action 2 callbacks and produce a CSV file.
4 years ago
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
4 years ago
7f351fd7c1
Fix: Action7/9 conditions 0F..12 reported roadtypes as valid tramtypes and vice versa.
4 years ago
e5dd19b0de
Cleanup: Properties 12 and 15 do not exist for road/tramtypes.
4 years ago
1f6b3a37f9
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
5 years ago
6ada7c3c7f
Logging: Log full file names of opened GRFs
5 years ago
fe9b024f1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/signs_cmd.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
# src/waypoint_cmd.cpp
5 years ago
030e8bf762
Rename programmable signals to programmable pre-signals
...
This is to make it less unclear what they actually are and do
5 years ago
d865916a07
Fix #7836 : Check coherency of NewGRF parameter min/max ( #7840 )
5 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
ca3c72438e
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
5 years ago
53f8d0b815
Codechange: Use std::vector for industry tile layouts
5 years ago
edfd378e93
Merge branch 'master' into jgrpp
...
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
5 years ago
04f659e768
Fix: Some typos found using codespell
5 years ago
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
69a6c494bf
Codechange: Set VehicleType's base type to byte instead of using VehicleTypeByte
5 years ago
bd2fdde759
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
5 years ago
be073b46da
Fix: Bounds check access to railtype_map. ( #7529 )
5 years ago
1c0643e419
Add GRF ID/name to "Too many NewGRF string parameters" messages
5 years ago
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
5 years ago
4f052fc2a4
Cleanup: Fix alignment after NULL -> nullptr change.
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
5 years ago
0cf25e84df
Fix #7447 , 3357cac847: Action 4 has feature 48 'original strings'. ( #7449 )
5 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
aa7ca7fe64
Codechange: Replaced SmallVector::Get(n) non-const with std::vector::data() + n
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
5 years ago
3357cac847
Fix: Bounds check NewGRF feature.
5 years ago
054d05b132
Codechange: NewGRF features are documented in hex, so display as hex.
5 years ago
fc5f67123a
Fix e66cec8f86: Permit loading of industry production callback with invalid cargo type.
...
It is only an error if the invalid result is actually used. This will be silently ignored at the moment.
It is still an error if a duplicate cargo type is returned.
5 years ago
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
5 years ago
1447661d20
Cleanup: spurious TODOs in newgrf.cpp ( #7297 )
5 years ago
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
5 years ago
21dc725762
Fix: Don't consider engines not in the current climate towards used livery classes.
5 years ago
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
5 years ago
48b334cf97
Add: Houses can accept up to 16 different cargo types via NewGRF.
...
New Action0 property 23 for feature 07, variable length, format B n*(B B). Initial byte is number of structures following. First byte in structure is cargo id, second is acceptance level in 1/8 units.
5 years ago
a26db59349
Add Action 5 support for programmable signals graphics
6 years ago
5b0cca4b57
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
7f87e3d61c
Add an action 5 type ID remapping mechanism
6 years ago
26ec41ebd5
Refactor Action 14 property mapping to make it more generic
6 years ago
2ab0a9611b
Rename Action0RemapFallbackMode to GRFPropertyMapFallbackMode
6 years ago
9608912d29
Merge branch 'newgrf-property-mapping' into jgrpp
6 years ago
2e539dfeca
Fix typo in static assert message
6 years ago
8b37e5aac2
Implement custom bridge pillar flag support
...
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars
Set values for default bridges and stations
6 years ago
2c88645bac
Merge branch 'newgrf-property-mapping' into jgrpp
6 years ago
04536952ee
Fix Action 0 mapped property length handling
...
Fix case when Num-info != 1
6 years ago
2bb6877f18
Fix syntax of static_assert
6 years ago
ceae4516ca
Add remappable properties for station min bridge height and bridge menu icon
6 years ago
06c458cb19
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
9a6a66a054
Add general NewGRF Action 0 property mapping scheme to Action 14
6 years ago
cb459132ac
Merge branch 'master' into newgrf-feature-detection
6 years ago
c10f6f9abb
Fix incorrect method documentation of ChangeGRFFeatureSetPlatformVarBit
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
e0c0394e37
Fix: Remove various dead or unnecessary assignments
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
4b0b4e0643
Feature: [NewGRF] Increase size of persistent storage to 256.
6 years ago
6391d49277
Fix: Variable 0x85 had no bounds checks.
6 years ago
97d6e3c90f
Fix: Variable 0x85 had no bounds checks.
6 years ago
f06c2e0475
Add NewGRF feature for varact2 station var 42
6 years ago
cb7eea8896
Add NewGRF features for more bridge types and Action 0 bridges prop 0x14
6 years ago
1aa13c9ea3
Allow NewGRFs to set the selection sprite for a bridge
...
Allow NewGRFs to define the sprite to use for a bridge in the bridge
selection window through Action0 property 14.
(cherry picked from commit 8434809a5b57477908e8d5f663e950546c7c8408)
6 years ago
b582ef8078
Add NewGRF feature: action0_station_prop1B
6 years ago
2735e7748c
Merge branch 'newgrf-feature-detection' into jgrpp
6 years ago
9f2515d793
Add general NewGRF feature detection scheme to Action 14
6 years ago
ef0a0b0f8e
Implement rail station property 1B, bridge clearance information
6 years ago
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
836d25e738
Codechange: Address some MSVC compiler warnings
6 years ago
c36c5ac851
Tag NewGRF unaligned memory load in StationChangeInfo
6 years ago
641e877441
Change grfmsg to be a macro which checks the debug level first
...
This is to avoid doing a sprintf when the result will be thrown away
6 years ago
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
6342099c4d
Allow 256 NewGRFs in multiplayer
...
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
4955996b35
Remove costly recalculation of a date format we already have.
...
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)
See #36
6 years ago
88be2413ce
Codechange #6729 : mute bogus GCC 7 warning ( #6733 )
...
We do a memset of (byte - byte), which strictly seen ranges from -254 .. 255, for which GCC warns.
But just before this memset is an if() which says the first byte has to be bigger than the second.
So this is a bogus warning.
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
55a503e6f2
(svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:
...
- nvar=0 is meant to return the calculated result.
- Missing references resolve to NULL and got identified with the default result.
- Missing 'break' broke overlapping cases.
- Splitting into non-overlapping cases could result in more than 256 cases.
6 years ago
a537fd5d0e
(svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:
...
- nvar=0 is meant to return the calculated result.
- Missing references resolve to NULL and got identified with the default result.
- Missing 'break' broke overlapping cases.
- Splitting into non-overlapping cases could result in more than 256 cases.
6 years ago
07d841d0ef
(svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent.
6 years ago
30f73d907a
(svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent.
6 years ago
dacd8d87ef
(svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR)
6 years ago
5df8ac52d6
(svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR)
6 years ago
86a9438070
Fix AirportSpec->rotation not being duplicated/freed correctly
...
Fixes crashes when resetting GRF data
7 years ago
6df5cac0df
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
6dec889306
(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant
7 years ago
13106675de
(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant
7 years ago
b56453f93b
(svn r27907) -Fix: AirportSpec::rotation was memleaking
7 years ago
7757f5050a
(svn r27907) -Fix: AirportSpec::rotation was memleaking
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
7 years ago
fa8d85b632
(svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF.
7 years ago
bc2382af06
(svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF.
7 years ago
5846aa5bfc
(svn r27768) -Codechange: Use if and IsInsideMM instead of switch-case sequences to test for consecutive values.
7 years ago
724f1f3b69
(svn r27768) -Codechange: Use if and IsInsideMM instead of switch-case sequences to test for consecutive values.
7 years ago
b5d1e58b0e
(svn r27767) -Codechange: Industries and houses should just use the default-case in Action 4.
7 years ago
f469b0be3e
(svn r27767) -Codechange: Industries and houses should just use the default-case in Action 4.
7 years ago
1a9e1c5e91
(svn r27766) -Fix: Obiwan opposed translations for text id D3FF and DCFF in Action 13.
7 years ago
4180276c81
(svn r27766) -Fix: Obiwan opposed translations for text id D3FF and DCFF in Action 13.
7 years ago
f89e8b76d6
Fix increased number of NewGRFs support.
...
Improve error handling if multiplayer limit is exceeded.
7 years ago
9d5f34fea6
Replace various uses of std::set/map with btree containers.
7 years ago
d25daebf2f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
7 years ago
f5e4d8e73a
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
7 years ago
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
7 years ago
7b553d255e
(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.
7 years ago
050271ed2d
(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.
7 years ago
1aedadb49b
(svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf
...
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
orig_extra.grf contains graphics specific to the original baseset only.
7 years ago
79027cbf9d
(svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf
...
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
orig_extra.grf contains graphics specific to the original baseset only.
7 years ago
ec9a920aab
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
7 years ago
8bd3a8a991
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
7 years ago
a3b356e057
(svn r27725) -Codechange: Remove IsOpenTTDBaseGRF and test for GCF_CONFIG instead, which does the same in all use-cases.
7 years ago
a76847f362
(svn r27725) -Codechange: Remove IsOpenTTDBaseGRF and test for GCF_CONFIG instead, which does the same in all use-cases.
7 years ago
5267b60027
(svn r27722) -Fix (r7490): GCF_SYSTEM was never set correctly.
7 years ago
ca329cd275
(svn r27722) -Fix (r7490): GCF_SYSTEM was never set correctly.
7 years ago
10ae23d3b9
Merge branch 'departure-boards' into jgrpp
...
VehicleListIdentifier API changes.
# Conflicts:
# src/departures.cpp
# src/vehicle_gui.cpp
8 years ago
d9bfe88261
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
8 years ago
616c02c42e
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
8 years ago
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
8 years ago
4c0423d6d8
Merge branch 'master' into jgrpp
8 years ago
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
53982003ee
(svn r27560) -Fix: typos in comments and string
8 years ago
91ddd32c20
(svn r27560) -Fix: typos in comments and string
8 years ago
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
0fd34a17a5
Update to v4 of house placing patch.
8 years ago
330a7327d6
Minor changes to avoid undefined behaviour warnings.
...
Avoid creating a reference from a nullptr.
Avoid trying a malloc and memcpy into a 0 length buffer.
Virtual trains should never be drawn.
8 years ago
580b2f7584
Merge branch 'template_train_replacement-sx' into jgrpp
...
Remove a duplicated declaration.
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/group_gui.cpp
# src/lang/english.txt
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/window_type.h
8 years ago
9db36bd87a
(svn r27507) -Add: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12.
8 years ago
f6577b6ad7
(svn r27507) -Add: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12.
8 years ago
cbf1ece361
Merge branch 'group_collapse' into jgrpp
8 years ago
36e66a17dc
(svn r27497) -Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set.
8 years ago
df82dcdf35
(svn r27497) -Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set.
8 years ago
69f3844d2e
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/settings_gui.cpp
src/settings_type.h
src/table/settings.ini
9 years ago
a93714a720
Add setting to show restricted electric signals using the default sprites.
...
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
9 years ago
ecf5943954
Fix some undefined behaviour: signed overflow and over shift left.
...
Caught by UndefinedBehaviourSanitizer.
9 years ago
8f5ef2ae01
Import and rebase Max NewGRFs patch
...
Fix trailing whitespace, clean up code a bit
http://www.tt-forums.net/viewtopic.php?p=894743#p894743
9 years ago
00981908d0
(svn r27138) -Fix: [NewGRF] Negative positions in industry layouts were interpreted incorrectly; however since the wrong behaviour is saner, define as the correct behaviour for GRFv8.
9 years ago
c655847235
(svn r27138) -Fix: [NewGRF] Negative positions in industry layouts were interpreted incorrectly; however since the wrong behaviour is saner, define as the correct behaviour for GRFv8.
9 years ago
e5a8f6e7d4
(svn r27119) -Fix: Action 7/9 condition 0A failed for present, but disabled, NewGRF.
9 years ago
f79ead7125
(svn r27119) -Fix: Action 7/9 condition 0A failed for present, but disabled, NewGRF.
9 years ago
2655de52d7
(svn r26990) -Feature: Add option to choose normal, double or quad-size interface.
10 years ago
253c91b17d
(svn r26990) -Feature: Add option to choose normal, double or quad-size interface.
10 years ago
d17a4e0918
(svn r26884) -Change: scale the NewGRF's snow line level according to the configured maximum map height
10 years ago
ddfc8372ee
(svn r26884) -Change: scale the NewGRF's snow line level according to the configured maximum map height
10 years ago
6592da4952
(svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111)
10 years ago
2361aaf601
(svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111)
10 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
b886c8db8c
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
e61fe21237
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
101b982263
(svn r26475) -Fix: potentially undefined shifts in NewGRF code
10 years ago
bbed2ff956
(svn r26475) -Fix: potentially undefined shifts in NewGRF code
10 years ago
c10662e4cc
(svn r26458) -Doc: Correct a few spelling mistakes (__ln__)
10 years ago
ba42bcdf49
(svn r26458) -Doc: Correct a few spelling mistakes (__ln__)
10 years ago
cc0d263d96
(svn r26245) -Codechange: No need for a map, if a vector suffices.
11 years ago
ee5c115950
(svn r26245) -Codechange: No need for a map, if a vector suffices.
11 years ago
3a1fcd76dd
(svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there.
11 years ago
00e7ceeca4
(svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there.
11 years ago
a498a56573
(svn r26130) -Codechange: add some guards against using invalid image indices
11 years ago
d2ba772f6a
(svn r26130) -Codechange: add some guards against using invalid image indices
11 years ago
5eb7aea386
(svn r26069) -Fix: missing break in NewGRF object handling
11 years ago
cf130ce9d8
(svn r26069) -Fix: missing break in NewGRF object handling
11 years ago
5b6a15f879
(svn r26067) -Fix: possible NULL dereference when getting NewGRF version
11 years ago
c035a9531b
(svn r26067) -Fix: possible NULL dereference when getting NewGRF version
11 years ago
8d97a5498b
(svn r25961) -Fix [FS#5779]: [NewGRF] A powered rail type implies it is compatible as well, but some NewGRF didn't state that causing the path reservation code to bail out in some cases because there wasn't a compatible path
11 years ago
ca7dce1fc2
(svn r25961) -Fix [FS#5779]: [NewGRF] A powered rail type implies it is compatible as well, but some NewGRF didn't state that causing the path reservation code to bail out in some cases because there wasn't a compatible path
11 years ago
5f9b8e4e8e
(svn r25878) -Feature: [NewGRF] Object property 0x18 to allow specifying the number of objects of that type being placed upon map creation
11 years ago
ed54d39201
(svn r25878) -Feature: [NewGRF] Object property 0x18 to allow specifying the number of objects of that type being placed upon map creation
11 years ago
0f1bc090a0
(svn r25842) -Codechange: Rename MAX_STATIONS to NUM_STATIONS_PER_GRF.
11 years ago
1b6ceef086
(svn r25842) -Codechange: Rename MAX_STATIONS to NUM_STATIONS_PER_GRF.
11 years ago
39f2f92eeb
(svn r25841) -Codechange: Use NUM_AIRPORTTILES_PER_GRF instead of NUM_AIRPORTTILES to properly distinguish limits per NewGRF and limits of the pool.
...
-Change: [NewGRF] Lower the limit of airport tile types per NewGRF from 256 to 255 to prevent usage of ID 0xFF in Action3, and thus allowing it to become an extended byte somewhen.
11 years ago
48d22700ad
(svn r25841) -Codechange: Use NUM_AIRPORTTILES_PER_GRF instead of NUM_AIRPORTTILES to properly distinguish limits per NewGRF and limits of the pool.
...
-Change: [NewGRF] Lower the limit of airport tile types per NewGRF from 256 to 255 to prevent usage of ID 0xFF in Action3, and thus allowing it to become an extended byte somewhen.
11 years ago
62d18c52c3
(svn r25840) -Codechange: Use NUM_AIRPORTS_PER_GRF instead of NUM_AIRPORTS to properly distinguish limits per NewGRF and limits of the pool.
11 years ago
a92b698525
(svn r25840) -Codechange: Use NUM_AIRPORTS_PER_GRF instead of NUM_AIRPORTS to properly distinguish limits per NewGRF and limits of the pool.
11 years ago
210fda2141
(svn r25839) -Codechange: Use NUM_HOUSES_PER_GRF instead of NUM_HOUSES to properly distinguish limits per NewGRF and limits of the pool.
...
-Change: [NewGRF] Lower the limit of house types per NewGRF from 256 to 255 to prevent usage of ID 0xFF in Action3, and thus allowing it to become an extended byte somewhen.
11 years ago
cfaa9457a6
(svn r25839) -Codechange: Use NUM_HOUSES_PER_GRF instead of NUM_HOUSES to properly distinguish limits per NewGRF and limits of the pool.
...
-Change: [NewGRF] Lower the limit of house types per NewGRF from 256 to 255 to prevent usage of ID 0xFF in Action3, and thus allowing it to become an extended byte somewhen.
11 years ago
670c4879cf
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
11 years ago
6a0439a789
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
11 years ago
7164124101
(svn r25837) -Codechange: Use NUM_INDUSTRYTILES_PER_GRF instead of NUM_INDUSTRYTILES to properly distinguish limits per NewGRF and limits of the pool.
...
-Change: [NewGRF] Lower the limit of industry tile types per NewGRF from 256 to 255 to prevent usage of ID 0xFF in Action3, and thus allowing it to become an extended byte somewhen.
11 years ago
ad8b387f9e
(svn r25837) -Codechange: Use NUM_INDUSTRYTILES_PER_GRF instead of NUM_INDUSTRYTILES to properly distinguish limits per NewGRF and limits of the pool.
...
-Change: [NewGRF] Lower the limit of industry tile types per NewGRF from 256 to 255 to prevent usage of ID 0xFF in Action3, and thus allowing it to become an extended byte somewhen.
11 years ago
Rubidium
Peter Nelson
glx22
Jonathan G Rennison
Patric Stout
Charles Pigott
frosch
Michael Lutz
Yexo
Niels Martin Hansen
glx22
S. D. Cloudt
JMcKiern
PeterN
Henry Wilson
frosch
Eddi-z
cirdan
keldorkatarn
adf88
matthijs
patch-import
planetmaker