1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Commit Graph

47 Commits

Author SHA1 Message Date
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
Michał Janiszewski
65c21db2fc Make GCC aware Object class is not final (#6726)
* GCC suddenly decided `Object` should be marked as `final`, however it is
used as a base class for more specific types that inherit from it.

* Also ignore -Wsuggest-final-methods for Object class

* Guard Object::GetName from being final
2017-11-23 10:14:28 +01:00
Michael Steenbeek
c1400a12eb Allow separate ride and vehicle names per ride entry 2017-11-21 18:55:42 +01:00
Christian F. Coors
06afeeda9a Apply some refactoring 2017-11-02 12:22:28 +01:00
Michał Janiszewski
00fd18809c Move extern "C" {} blocks to headers (#6282) 2017-09-18 17:05:28 +02:00
Michał Janiszewski
79d76759bb Fix #5516: Update copyrights for 2017
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
2017-06-01 21:55:10 +02:00
Michał Janiszewski
0a36af19e4 Mark classes as final to help devirtualisation 2017-01-13 12:12:50 +01:00
Ted John
25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00