1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Commit Graph

753 Commits

Author SHA1 Message Date
Michael Bernardi
f110ea14f5 Apply check-code-formatting changes 2024-10-03 10:49:25 +10:00
Aaron van Geffen
931f0705ce Introduce PeepNamesObjects for 'real' names of peeps (#22758)
* Add initial PeepNamesObject implementation

* Add peep names object to default objects

* Append peep names object to object list for older saves

* Deduplicate AppendRequiredObjects functions

* Remove built-in 'real name' tables

* Increment park version; introduce kPeepNamesObjectsVersion

* Update objects dependency to v1.4.8
2024-09-29 15:05:55 +02:00
Harry Hopkinson
0b77287370 Refactor SceneryGroupObject.cpp constants 2024-09-24 20:42:13 +00:00
Michael Steenbeek
066e5a557b Close #17025: Do not change ride type of JSON ride objects (#22765) 2024-09-21 22:44:53 +02:00
Aaron van Geffen
cf516db6dc Split StringTypes.h off from String.hpp; adjust header includes 2024-09-10 23:55:53 +02:00
mrmbernardi
903460ff52 Fix #22231: Invalid object version can cause a crash (#22675) 2024-09-03 04:21:49 +10:00
Michael Steenbeek
47800cddcf Change RTD flags to a strong enum 2024-08-13 20:20:25 +00:00
Harry Hopkinson
4744c7416d Refactor object and network constants to kCamelCase 2024-08-11 20:21:24 +00:00
Greg
dae5b00f05 Close #22509: Refactor SPR_NONE to ImageIndex (#22517)
* ImageIndex typedef moved from ImageId.hpp to new file ImageIndexType.h.

* SPR_NONE redefined as ImageIndex type in ImageIndexType.h.

* SPR_NONE renamed to kSpriteIdNull

* Remove casts and enum all sprites as ImageIndex

* Remove sprites.h include from LandTool.h, RideData.h

* Ensure all RTD headers include sprites.h

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2024-08-11 09:58:28 +00:00
Michael Steenbeek
e813532efb Close #15750: Multiple park entrance types in one park (#21909)
* Add new park entrance placement window

* Start entrance tool as soon as window opens;

* Rename constants to conform to current code standards

* Increment PARK_FILE_CURRENT_VERSION

* Increment kNetworkStreamVersion

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2024-08-04 23:02:16 +00:00
Aaron van Geffen
d574946c1a Remove includes of Cursors.h in object header files 2024-08-03 20:46:58 +02:00
Duncan
a07b56a655 Move Viewport functions into Ui (#22454)
* Move viewport functions into ui

* Move footpath function to ui

* Don't include viewport in footpath.h

* Include missing includes
2024-08-02 06:01:31 +01:00
ζeh Matt
fed107b008 Make forceRedraw implicit when we are on the main thread 2024-08-01 23:48:54 +03:00
Aaron van Geffen
51816d2bd5 Disambiguate calls to UtilBitScanForward (#22402) 2024-07-28 18:44:59 +02:00
Aaron van Geffen
05e56517ab Adopt existing namespaces into OpenRCT2 namespace (#22368)
* Put all of TitleSequenceManager into the same namespace

* Move RideConstructionState into the OpenRCT2 namespace

* Adopt existing namespaces into OpenRCT2 namespace

This adds `using namespace OpenRCT2` to compilation units where appropriate,
as a means to get the codebase to compile until these units have been placed
in a namespace of their own.
2024-07-26 09:59:58 +02:00
Aaron van Geffen
e645fc7ac4 Widen progress range for object loading proces 2024-07-16 19:30:48 +02:00
Aaron van Geffen
a5054c68d1 Add progress reporting to loading required objects 2024-07-16 18:14:44 +02:00
Aaron van Geffen
faac0ebeb5 Rewrite ObjectManager::LoadObjects to use a JobPool 2024-07-16 18:14:23 +02:00
Aaron van Geffen
3d5c19de08 Drop Localisation.h include where not required 2024-07-13 13:33:32 +02:00
Aaron van Geffen
229df6d66d Move CSStringConverter from localisation to rct12 folder (#22280) 2024-07-12 20:37:00 +00:00
Aaron van Geffen
b5ef2693b0 Remove common.h include from all units 2024-07-09 16:45:19 +02:00
Aaron van Geffen
8cef18cd2f Include cassert as needed at unit level 2024-07-09 16:43:03 +02:00
Aaron van Geffen
51873dc0f6 Include Diagnostic.h at unit level 2024-07-09 16:23:31 +02:00
Aaron van Geffen
f9dcc21f05 Replace assert_struct_size macro with static_assert 2024-07-09 15:23:20 +02:00
Aaron van Geffen
db17fc6dad Remove pseudo-keyword 'abstract' 2024-07-09 15:17:07 +02:00
Aaron van Geffen
7cc1cd09ea Move StringIdType.h include out of common.h 2024-07-09 15:05:19 +02:00
AuraSpecs
8968c7d3fe Update OpenMusic to version 1.6 (#22262) 2024-07-10 07:43:52 +00:00
John
71cba8ac37 Add music track listing to ride music window (#20980)
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2024-07-08 17:03:54 +02:00
Aaron van Geffen
69c5e6ad9e Move money types into Money.hpp 2024-05-14 16:35:00 +02:00
Michał Janiszewski
3c35558f3f Fix compilation on Arch Linux with GCC 14 (#22031)
Fixes #22029
2024-05-13 22:09:00 +00:00
Duncan
eded6e2129 Readd algorithm header where it is used (#22000) 2024-05-10 10:37:01 +01: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
Aaron van Geffen
ca6f142a97 Remove Config.h include from many places 2024-05-08 22:29:32 +02:00
Michał Janiszewski
7b12667ddb Reduce <algorithm> include (#21947) 2024-05-01 13:47:27 +02:00
mrmbernardi
f4cebb11df Speed up TerrainSurfaceObject::GetImageId() 2024-04-26 09:52:19 +02:00
Rahul Unniyampath
893ae7f0ca Refactor constant notation in Audio.h
Co-authored-by: ncerroneumich <ncerrone@umich.edu>
2024-04-21 00:12:13 +02:00
Michael Steenbeek
271a22d00e Merge pull request #21681 from AaronVanGeffen/obj-list-refactor
Move various object list properties out of ObjectTypes header
2024-04-12 11:54:13 +02:00
Michael Steenbeek
a38039f6e4 Add feature to allow overriding x/y offsets in GX files 2024-04-05 15:41:35 +02:00
Michael Steenbeek
9062049be1 Fix sound effects not working with RCTC base, fix audio object conflict
Due to this overwriting of object IDs, loading the sound effects would not work on RCTC. This overwriting also caused object conflicts which weren’t always won by the RCTC one. This fixes both problems by using non-clashing names, and only renaming one to `rct2.audio.base`, the name expected by the asset packs.
2024-03-31 22:28:17 +00:00
Gymnasiast
c232aa9b0c Create import meta object, use single method for JSON parsing 2024-03-30 18:13:03 +01:00
Aaron van Geffen
cec251bb63 Take kAllObjectTypes internal as well 2024-03-27 21:26:07 +01:00
Aaron van Geffen
98c3c8b22c Add missing header to ObjectEntryManager.h 2024-03-27 20:39:16 +01:00
Aaron van Geffen
e898e9211d Move kObjectEntryGroupCounts to ObjectList.cpp 2024-03-27 20:13:10 +01:00
Aaron van Geffen
d645906003 Move kTransientObjectTypes, kIntransientObjectTypes out of header 2024-03-27 19:51:57 +01:00
Aaron van Geffen
5f4d02a6f7 Move kLegacyObjectEntryGroupEncoding to ObjectRepository.cpp 2024-03-27 19:20:05 +01:00
Claudio Tiecher
2c4c2da319 Part of #21421: Refactor VEHICLE_SEAT_PAIR_FLAG 2024-03-25 16:17:32 +01:00
Peter Froud
1e51925968 Change "ternary" to "tertiary" (#21582) 2024-03-11 08:42:54 -03:00
James103
1d8dc111f1 Replace 2023 with 2024 in copyright headers (#21139)
Replace all instances of the year 2023 with 2024 in all copyright headers
2024-01-01 12:52:28 +01:00
AuraSpecs
83598ba898 OpenMusic release v1.5 (#21004)
Adds Rock style 4 ride music by Blackend Blue.
2023-11-28 06:09:58 -03:00
AuraSpecs
1223b739e0 Create OpenMusic 1.4 release (#20795)
nl-NL: Fix/amend some descriptions by @Gymnasiast in #42
    Update French translation by @rmnvgr in #43
    Normalize the ragtime tunes by @karst in #44
    Complete list of Fairground organ style 2 tunes by @karst in #45
    Update Hungarian translation by @anon569 in #47
    Add Mystic style by @SkyshardMelody in #46
    pt-BR: Translate Mystic Style by @tupaschoal in #48
    hu-HU: Translate Mystic Style by @anon569 in #49
2023-09-21 19:36:37 +01:00