Jonathan G Rennison
b381a30d2d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_media_func.h
# src/cargopacket.h
# src/gfxinit.cpp
# src/industry_cmd.cpp
# src/window_gui.h
2023-05-26 20:08:05 +01:00
Rubidium
f74e26ca7e
Codechange: replace error/usererror printf variant with fmt variant and rename
2023-04-25 17:55:09 +02:00
Patric Stout
7aa2b9ab0a
Codechange: move all date-related variables inside the timer ( #10706 )
2023-04-24 15:56:01 +00:00
Peter Nelson
075671bcfc
Codechange: Rename DECLARE_ENUM_AS_BIT_SET parameter to enum_type.
...
It works on enums not masks.
2023-04-24 09:17:37 +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
Charles Pigott
6fc28d649e
Cleanup: Unused alloca definitions and includes
2023-04-15 16:57:00 +01:00
Jonathan G Rennison
9521e7ef2b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/elrail.cpp
# src/ground_vehicle.hpp
# src/landscape.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnelbridge_cmd.cpp
2023-04-12 19:34:11 +01:00
Charles Pigott
8aea13a85b
Codechange: Use fmt for SlErrorCorruptFmt
2023-04-10 18:58:48 +01:00
Rubidium
41ef7c88af
Codechange: make a numer of Slope related functions constexpr
2023-04-09 19:00:26 +02:00
Jonathan G Rennison
633c72b10b
Add utility function to test equivalence of multimaps
...
Returns true if multimap values for a key are in not in the same order,
but are permutations of each other.
2023-03-07 00:31:14 +00:00
Jonathan G Rennison
88d7a8ea13
Formatting: Fix indentation of public/private specifiers
2023-02-28 01:44:28 +00:00
Michael Lutz
564de01d66
Remove: SmallMatrix be gone.
2023-02-26 21:41:24 +01:00
Michael Lutz
fe27db3dfd
Codechange: [Linkgraph] Store edges in each node and not in a global matrix.
2023-02-26 21:41:24 +01:00
Jonathan G Rennison
83b9344f5c
Add a POD pool-type container class
2023-02-26 13:31:39 +00:00
Jonathan G Rennison
85889143c7
Add mode to AutoRestoreBackup to not change backed up value
2023-02-15 22:02:23 +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
Rubidium
f001e84e5e
Codechange: use RAII to automatically restore _cur_dpi after use
2023-01-28 20:33:02 +01:00
Rubidium
b7a5d8e296
Codechange: add annotation to selectively force inlining in debug build
2023-01-28 20:32:45 +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
1ed0b35520
Fix #10009 : bad overflow protection when taking out loans
2023-01-15 12:04:50 +01:00
Michael Lutz
c98a5c37d3
Remove: SmallMatrix be gone.
...
(cherry picked from commit 6dd8a4d670f921ee685d1a6326d304da6e9fc245)
2023-01-05 20:15:50 +00:00
Jonathan G Rennison
64c210f770
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/engine.cpp
# src/engine_func.h
# src/group_gui.cpp
# src/lang/english.txt
# src/newgrf.cpp
# src/saveload/oldloader_sl.cpp
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
2022-12-28 01:46:29 +00:00
Jonathan G Rennison
f1f73ddd6e
Factor out packet deserialisation functions into common file
2022-12-07 21:04:20 +00:00
Jonathan G Rennison
c29b395357
Factor out packet serialisation functions into new common file
2022-12-07 18:10:55 +00:00
Jonathan G Rennison
6d4474b84e
Merge tag '13.0-beta2' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2022-12-04 20:43:11 +00:00
Peter Nelson
fb3b2c63bc
Add: RectPadding type.
...
This is similar to Rect but specifies padding to apply to a Rect.
(cherry picked from commit 75b222b0d9
)
2022-12-03 22:28:49 +00:00
Peter Nelson
cabb4b08d9
Codechange: Add some Rect helpers.
...
Shrink/Expand/Translate are marked nodiscard as they provide a new Rect
rather than modifying the original Rect.
(cherry picked from commit d8e01f8aa5
)
2022-12-03 22:28:49 +00:00
PeterN
a7adadcf9b
Fix: Indent production in industry window and resolve button issues. ( #10184 )
...
Industry production used to be indented, although a different amount than
the industry accepts list. This is now added back, with the standard indent
width.
Additionally the cheat-mode production modifier buttons now support RTL and
the list height now takes account of the button height.
2022-11-19 21:18:53 +00:00
Jonathan G Rennison
6f963a1268
Include company infrastructure totals in state checksum
2022-11-13 11:53:16 +00:00
Peter Nelson
75b222b0d9
Add: RectPadding type.
...
This is similar to Rect but specifies padding to apply to a Rect.
2022-11-12 18:28:39 +00:00
Peter Nelson
d8e01f8aa5
Codechange: Add some Rect helpers.
...
Shrink/Expand/Translate are marked nodiscard as they provide a new Rect
rather than modifying the original Rect.
2022-11-12 18:28:39 +00:00
Jonathan G Rennison
29a1e49c28
Change various asserts to not be included in release builds
2022-10-22 12:34:54 +01:00
Jonathan G Rennison
1d93cd59e7
Add utility function for integer dynamic range extension encoding
2022-09-06 22:33:39 +01:00
Jonathan G Rennison
67104b4dc1
Add a simple 32 bit to 32 bit hash function (MurmurHash3)
2022-06-13 01:08:03 +01:00
Jonathan G Rennison
ce98daedce
Util: Add a y-combinator template class
2022-06-01 22:34:06 +01:00
Jonathan G Rennison
4a8b2df108
Util: Add a non-dynamic arena allocator based on DynUniformArenaAllocator
2022-05-29 19:56:49 +01:00
Jonathan G Rennison
29521ef883
Fix SB function when using sizes greater than 32 bits
2022-01-13 01:06:31 +00:00
Michael Lutz
13528bfcd0
Codechange: Un-bitstuff all remaining commands.
2021-12-16 22:28:32 +01:00
Michael Lutz
6fe445e6c0
Codechange: Un-bitstuff station/depot/waypoint commands.
2021-12-16 22:28:32 +01:00
Michael Lutz
21675ec7e2
Codechange: Un-bitstuff vehicle/engine commands.
2021-12-16 22:28:32 +01:00
Michael Lutz
a05fd7aa50
Change: [Network] Transfer command data as serialized byte stream without fixed structure.
...
The data will be transmitted as the length followed by the serialized data. This allows the command
data to be different for every command type in the future.
2021-12-16 22:28:32 +01:00
Michael Lutz
b0990fcff7
Codechange: Make TileIndex a "strong" typedef to give it a distinct type.
...
This is accomplished by changing it to a single member struct with the
appropriate operator overloads to make it all work with not too much
source modifications.
2021-12-16 22:28:32 +01:00
Michael Lutz
5ddfdc8516
Codechange: Declare our custom enum operators as constexpr.
2021-12-16 22:28:32 +01:00
Michael Lutz
39e8783f4b
Fix: Template syntax error when using 'span' with a container type.
2021-12-16 22:28:32 +01:00
frosch
bc22e9333e
Fix: if vehicles only refit to cargo-slots >= 32, the default cargo was wrong. ( #9744 )
2021-12-12 17:35:41 +01:00
Jonathan G Rennison
c6bd01b2f2
Add an IsOddParity bitmath function
2021-12-05 17:40:42 +00:00
Jonathan G Rennison
58d8418f83
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/arabic_egypt.txt
2021-11-10 01:05:30 +00:00
Tyler Trahan
48c1c7f221
Cleanup: Fix typo in overflowsafe_type comment
2021-11-09 20:51:38 +01:00
Jonathan G Rennison
f67407d777
Fix missing include in core/overflowsafe_type.hpp
...
See: #334
2021-11-08 18:35:09 +00:00