Commit Graph

10779 Commits

Author SHA1 Message Date
Aaron van Geffen 6c66bff4b6
Let heavy snow and blizzards make guests buy and use umbrellas (#21986) 2024-05-14 19:18:42 +02:00
Aaron van Geffen 308219d32e
Move speed literal _mph to Speed.hpp (#22033) 2024-05-14 17:04:49 +00:00
Michał Janiszewski 3c35558f3f
Fix compilation on Arch Linux with GCC 14 (#22031)
Fixes #22029
2024-05-13 22:09:00 +00:00
spacek531 104a5d5222
Add legacy field for booster parameters to Ride Type Descriptor
This pull request is spun off from Unify Speed #16692 for ease of review, as well as making it easier to address some future features independent of Unify Speed.

This PR separates the OperationSettings field of RTD into 3 new fields, since the OperationSettings struct was bloated with things that are not operation settings.

This PR implements legacy and non-legacy ("modern") booster setting fields. In preparation for Unify Speed, the legacy properties are set to match the values as they stand. Separating legacy from modern allows the modern values to be changed in accordance with #21752 while preserving backwards-compatibility.

Unify Speed or a spun-off subset PR will implement a vehicle flag to switch between legacy and modern behavior, which all older parks will import with, while new rides will use the non-legacy "modern" behavior. Unify speed or a spin-off will implement enforcing brake and booster speeds.
2024-05-13 21:45:18 +00:00
Michael Steenbeek 6979e88b9e
Clean up more diagonal track drawing
This consists mostly of using `TrackPaintUtilDiagTilesPaint()` where appropriate, as well as cleaning up some duplicate constants in the monorail/miniature railway paint code.
2024-05-13 14:37:35 +02:00
Michał Janiszewski 7239810d39
Restore `#include <algorithm>` in AssetPackManager.cpp (#22028)
https://aur.archlinux.org/pkgbase/openrct2-git/
2024-05-13 13:15:07 +02:00
spacek531 6df16c7946
Clean up more ride type references 2024-05-13 09:20:51 +02:00
Aaron van Geffen 4ffe00aaba
Keep options window centred after a resize (#22026) 2024-05-12 21:07:32 +00:00
Michael Steenbeek 59297f0038
Use a supports constant in track drawers (#22024) 2024-05-12 21:43:39 +02:00
Michael Steenbeek 0e245692b2
Fix #22008: Lay-down roller coaster uses the wrong supports 2024-05-12 10:37:53 +02:00
Michael Steenbeek 5407ba2d55
Close #22014: Change crossingMode to a strong enum (#22020) 2024-05-12 07:46:32 +01:00
Aaron van Geffen 57a6b0a00c
Remove STR_VIEWPORT (#22018)
* Remove STR_VIEWPORT

* Remove StringIds.h include from Main.cpp
2024-05-11 18:21:45 +00:00
Aaron van Geffen 96ce7f706f Move widget constants from Windows.h to Widget.h 2024-05-10 22:14:10 +02:00
Aaron van Geffen 23551c09b3 Move FPS counter below toolbar if buttons are centred 2024-05-08 23:08:06 +02:00
Aaron van Geffen e423575411 Add a config setting to toggle toolbar mode 2024-05-08 21:19:57 +02:00
Aaron van Geffen 945a799228
Merge pull request #22005 from AaronVanGeffen/config-struct
Introduce Config namespace and struct
2024-05-10 22:06:51 +02:00
Michael Steenbeek 3f92139dad
Merge pull request #22015 from Gymnasiast/refactor/metal-support-stuff
Refactor metal supports
2024-05-10 21:57:49 +02:00
Gymnasiast 3ed61cac9a
Name and refactor metal supports maps 2024-05-10 21:35:04 +02:00
Gymnasiast 98e980f535
Make MetalA and MetalB more like each other 2024-05-10 21:31:20 +02:00
Aaron van Geffen 9e206d5528
Remove dependency on StringIds.h from Localisation.h (#22011)
* Remove dependency on StringIds.h from Localisation.h

* Include Language.h in UTF8.cpp for function declarations

* Rename tests/Localisation.cpp to tests/LocalisationTest.cpp
2024-05-10 19:14:05 +00:00
Aaron van Geffen 86835836b5
Move strings exclusively used by ride meta data to RideStringIds.h (#22010) 2024-05-10 19:05:05 +00:00
Gymnasiast 42add207e9
Rename SURFACE_STYLE_FLAG_RAISE_OR_LOWER_BASE_HEIGHT 2024-05-10 20:42:12 +02:00
Gymnasiast 4cdaaa9810
Refactor slope flags 2024-05-10 20:16:07 +02:00
Gymnasiast 9e2463ff52
Name SUPPORTS_SLOPE_5, use it consistently 2024-05-10 20:16:03 +02:00
Gymnasiast b3d9255c2d
TrackData.h: drop unused import of TrackPaint.h 2024-05-10 20:15:55 +02:00
Gymnasiast 09dc7077c1
Drop 3rd parameter to PaintUtilSetGeneralSupportHeight()
It’s always 0x20
2024-05-10 20:15:51 +02:00
Harry Hopkinson 740ee91cb5
Refactor more constants in TrackPaint.h 2024-05-10 16:05:05 +02:00
Aaron van Geffen 347ce53f26
Re-introduce message on successful screenshot (#21983)
* Re-introduce message on successful screenshot

* Automatically close previous screenshot notices before new ones
2024-05-10 15:04:12 +02:00
Aaron van Geffen 92aeace98c Just undef interface macro in Config.h, if present 2024-05-10 13:07:33 +02:00
Aaron van Geffen 617003dff6 Use WIN32_LEAN_AND_MEAN in UiContext and Platform 2024-05-10 12:57:05 +02:00
Aaron van Geffen 740b624eed Remove extraneous includes from Localisation.cpp 2024-05-10 12:30:48 +02:00
Aaron van Geffen a63d86c488 Introduce Config namespace and struct 2024-05-10 12:10:21 +02:00
Aaron van Geffen ba9c84f835
Move Csg path related functions into their own header (#22004) 2024-05-10 12:05:52 +02:00
Harry Hopkinson 98ac3a1bbc
Replace GfxDrawString() with DrawText() 2024-05-10 09:56:03 +00:00
Duncan eded6e2129
Readd algorithm header where it is used (#22000) 2024-05-10 10:37:01 +01:00
Duncan 2884e095c9
Don't include windows.h when not used 2024-05-10 09:27:17 +02:00
Mike d58673105d
Close #21974: No reason specified when attempting to place path additions on junctions 2024-05-09 12:45:33 +00:00
Michał Janiszewski 63e996194f
Reduce inclusion of FixedVector.h (#21994)
FixedVector class requires use of algorithm include, one of C++'s
heaviest, while in practice it is used only in handful of places.

See #21947 for methodology

372-266=106 #include <algorithm>s fewer
2024-05-09 12:34:18 +00:00
Claudio Tiecher 10a5d790c6
Part of #21421: replace define with constexpr (#21760)
* Part of #21421: refactor TUNNEL_MAX_COUNT

* Part of #21421: deleted unused OBJECT_SELECTION_NOT_...

* Part of #21421: refactor MAX_SERVER_DESCRIPTION_LENGTH

* Part of #21421: refactor EXPENDITURE_TABLE_MONTH_COUNT

* Part of #21421: refactor FINANCE_GRAPH_SIZE

* Part of #21421: refactor NETWORK_STREAM_VERSION and _ID

* Part of #21421: MONEY_STRING_MAXLENGTH

* Part of #21421: deleted MAX_USER_STRINGS

* Part of #21421: refactor USER_STRING_MAX_LENGTH

* Part of #21421: deleted USER_STRING_END

* Part of #21421: refactor REAL_NAME_START

* Part of #21421: refactor REAL_NAME_END

* Part of #21421: deleted FONT(X) and FONT_OPENRCT2_SPRITE

* Part of #21421: refactor CURRENCY_SYMBOL_MAX_SIZE

* Part of #21421: refactor CURRENCY_RATE_MAX_NUM_DIGITS

* Part of #21421: refactor SCROLLABLE_ROW_HEIGHT

* Part of #21421: refactor ADD_CLAMP_BODY

* Part of #21421: applied clang-format to Util.cpp

* Part of #21421: incorporate feedback from #21760

* Part of #21421: revert to nbsp in Currency.cpp

* Part of #21421: fix merge conflict

* Part of #21421: fix more merge conflict

* Part of #21421: apply clang format

* Part of #21421: using std::numerics for finding bounds

* Part of #21421: fix reference to kAddClampBody

* Part of #21421: improved on comments about AddClamp func

* Part of #21421: apply correct network stream version number

* Part of #21421: apply clang-format
2024-05-09 08:59:03 -03:00
Michał Janiszewski 24a2db9fc9
Remove <algorithm> include from Location.hpp (#21993)
See #21947 for methodology

528-372=156 `#include <algorithm>`s fewer
2024-05-09 11:54:40 +00:00
Harry Hopkinson 613d60b446
Refactor more constants in TrackPaint.h (#21942) 2024-05-09 06:41:47 -03:00
Aaron van Geffen a61a561d01 Remove Currency.h include from Localisation.h 2024-05-08 23:41:42 +02:00
Aaron van Geffen a627cf7a1e Remove Drawing.h include from Config.h 2024-05-08 23:18:53 +02:00
Aaron van Geffen ca6f142a97 Remove Config.h include from many places 2024-05-08 22:29:32 +02:00
Michał Janiszewski 11510a0e0b
Guard against possible nullptr dereference when prefetching BBox (#21978) 2024-05-07 06:21:27 +02:00
Michał Janiszewski a611244b31
Fix #21976: Add algorithm include to fix gcc14 compile (#21977)
Co-authored-by: H3o66 <chris.h3o66@gmail.com>
2024-05-06 20:40:36 +00:00
Aaron van Geffen d6ce62e74f
JSON: allow/ignore comments in parser 2024-05-06 16:15:00 +02:00
Aaron van Geffen 893392d987
Scripting: allow precise and safe control of peep animations 2024-05-05 21:09:41 +00:00
Michael Steenbeek bf74dfba7b
Merge pull request #21965 from AaronVanGeffen/fix-cli-editor
Fix loading editor from command line
2024-05-05 22:42:24 +02:00
Aaron van Geffen 831c7651bb
Scripting: tailor costume assignment to each staff type
In order to transition staff costumes to objects, we must further disentangle staff from regular peeps. This has many advantages, such as making custom entertainers or even handymen costumes. However, this means putting some restrictions on what costumes can be assigned to staff in the mean while.

We are aware of plug-ins allowing staff to be decorated like normal peeps, though, e.g. using @Manticore-007's Peep Editor. Splitting staff from peeps will mean breaking such functionality. We can do our very best to reverting 'invalid' staff to their normal outfits instead of them outright disappearing. However, in the mean time, we should disallow peep costumes from being assigned to staff to prevent further disappointment down the line.

Once we get to actually adding custom staff costumes, I plan to add a new plug-in API to get available costumes for a particular staff type. This would apply to entertainers, but also other staff types. This should make it easier for plug-in authors to tap into custom costumes in the future.
2024-05-05 22:41:52 +02:00