Ted John
46d69126ea
Split identifier and legacyIdentifier on Object
2020-05-08 15:28:48 +01:00
Michael Steenbeek
b89130e0f3
Use ObjectEntryIndex in more places ( #11440 )
2020-04-25 00:10:47 +02:00
Ted John
b9e85f6b90
Fix #11259 : Custom JSON object breaks saves ( #11356 )
...
Do not attempt to pack JSON objects into S6 files.
2020-04-19 14:18:12 +02:00
Michael Steenbeek
13a2f67400
Fix #11208 : Cannot export parks with RCT2 DLC objects ( #11212 )
...
* Do not try to export official objects
* Do not override legacy object's source games
* Amend changelog
2020-04-04 07:06:34 +01:00
Michael Steenbeek
c519512cfe
Create ObjectEntryIndex ( #10980 )
2020-03-20 19:28:39 +01:00
Michael Steenbeek
d86dce17e8
Prepare object indices for uint16_t (part 2) ( #10966 )
2020-03-18 21:27:53 +01:00
Gymnasiast
459a0318cf
Implement review requests
2020-03-18 16:22:08 +01:00
Michael Steenbeek
18ebe73dfa
Replace object_entry_get_type() with method ( #10937 )
2020-03-15 12:07:04 +01:00
Michael Steenbeek
d085a0ed20
Split OBJECT_ENTRY_COUNT into RCT2/OpenRCT2 variants ( #10877 )
2020-03-05 17:25:57 +01:00
Ted John
1a6e5b5548
Fix #9680 : invalid-read in ride_entry_get_supported_track_pieces ( #9681 )
2019-08-03 19:55:24 +02:00
Aaron van Geffen
2af13904c5
Update copyright notices for 2019. ( #8903 )
2019-03-17 07:16:15 +00:00
Ted John
06f203a7e7
Implement surfaces, edges and stations as objects
2018-12-09 23:30:40 +00:00
Michał Janiszewski
f488c4bf35
Forward-declare json_t and reduce Json.hpp inclusion ( #8368 )
2018-12-05 20:31:32 +01:00
Gymnasiast
c879bb5708
Modify SetSourceGames signature
2018-07-30 21:41:45 +02:00
Gymnasiast
b257619418
Use vector for source games
2018-07-30 21:41:12 +02:00
Michael Steenbeek
2a64ec7aff
Use sourceGame parameter in JSON files instead of originalId
2018-07-30 21:39:27 +02:00
Ted John
ec0d35bac7
Add new source field to ORI struct
2018-07-30 21:32:07 +02:00
Michael Steenbeek
5ce76e1603
Attempt at showing secondary source game
2018-07-30 21:28:55 +02:00
Michael Steenbeek
7f1960d375
Remove old source game tables
2018-07-30 21:22:32 +02:00
clang-format
d787872cbe
Indent preprocessor directives
2018-07-23 16:00:23 +02:00
clang-format
a6a12af1ec
clang-format object
2018-07-23 16:00:06 +02:00
Michael Steenbeek
1b08fb4e69
Replace our own integer types with standard ones
2018-06-20 17:30:40 +02:00
Hielke Morsink
0cf256ac9e
Ready copyright notice for clang-format
...
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.
I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
Hielke Morsink
204dd4439b
Mark unused arguments in the libopenrct2 project
...
For dummy classes and functions with empty bodies I've only commented out the arguments, for all others I used C++17's [[maybe_unused]].
2018-06-06 21:03:11 +02:00
Ted John
376b6d04d8
Fix Linux builds
2018-05-29 18:39:13 +01:00
Hielke Morsink
6c65c3d64d
Merge pull request #6774 from janisozaur/fixes
...
Various code improvements
2018-05-15 14:38:43 +02:00
Ted John
580f1baff2
Get basic relative .png loading
2018-05-13 11:36:35 +01:00
Ted John
7075f6ca25
Use correct language for scan-objects
2018-05-11 20:39:00 +01:00
Michał Janiszewski
0a92e74ced
Minor fixes
2018-05-11 15:38:30 +02:00
Ted John
edb9dc39ab
Pass object repository as a dependency when loading objects
2018-04-19 23:51:05 +01:00
Ted John
f3c125853b
Do not load images for objects if in headless mode
2018-03-26 21:38:09 +02:00
Ted John
ec446ac9d6
Return image and string table by reference
2018-03-26 21:37:23 +02:00
Ted John
900bc48efa
Write common JSON string loader
2018-03-26 21:37:22 +02:00
Ted John
5eba067aba
Load images from OBJDATA DATs
2018-03-26 21:35:44 +02:00
Ted John
a1f360ab7d
Spike 1: Add RCT1 toilets JSON
2018-03-26 21:35:43 +02:00
Hielke Morsink
55979a3fff
Remove and replace C typedefs
...
`typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way.
This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
Ted John
7e01dcdaaf
Remove legacy object list
2018-02-12 12:48:41 +00:00
Ted John
51321a71e7
Get entries directly from object manager
2018-02-12 12:48:41 +00:00
Ted John
d22572d0b9
Remove rct_object_entry_extended
2018-02-12 12:48:41 +00:00
Ted John
4d8fe051e8
Remove most usages of object_entry_groups
2018-02-12 12:48:41 +00:00
Ted John
d905dde070
Simplify selected object flags
2018-02-12 12:48:41 +00:00
Gymnasiast
34a6b5ef92
Remove __cplusplus ifdefs
2018-02-05 16:20:15 +01:00
Gymnasiast
778ba466c5
Remove almost every extern C block
2018-02-05 16:20:15 +01:00
Michael Steenbeek
9bd812c855
Move most of _legacy.c to C++ ( #7117 )
2018-02-02 23:11:41 +01:00
Michael Steenbeek
b4018d398c
Add more object source filters
2018-01-31 13:07:20 +01:00
Michael Steenbeek
7d5de63484
Refactor rct_research_item, refactor access to rct_research_item
...
This takes away a lot of the bitshift and bit mask trickery previously used.
2018-01-07 15:33:44 +01:00
Michael Steenbeek
347ff702d0
Refactor objects
2018-01-03 10:16:51 +01:00
Michael Steenbeek
2e79aaf54c
Fold vehicle name into regular name
2017-12-22 15:28:41 +01:00
Ted John
31e112cf3b
Use std::string for objects
2017-12-14 14:38:14 +01:00
Michael Steenbeek
57a2612365
Fix scenery group assignment race conditions
...
When adding entries to scenery groups by hand, like we do for a lot of ToonTowner's stuff, it currently tries to get the loaded scenery group. If this happens not to be loaded at that time, this will fail.
Instead, hardcode the headers - that's how object .DATs do this anyway.
2017-12-01 11:54:25 +01:00
