1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Commit Graph

38 Commits

Author SHA1 Message Date
Simon Jarrett
9c5e9f8dbc Replace includes of Json.hpp in header files with json_fwd.hpp 2020-10-02 11:31:20 +01:00
Simon Jarrett
0c58dfa1b3 Refactor objects to use new JSON library 2020-09-16 20:18:53 +01:00
Łukasz Pękalski
bfdc1f6d2a Close #12430: Refactor OBJ_STRING_ID to use strong enum (#12796) 2020-08-28 23:36:58 -03:00
Matt
83355e35cc Move IStream, MemoryStream, FileStream into OpenRCT2 namespace 2020-08-05 16:29:36 +02:00
TomasZilinek
9d965ccfb6 Part of #12017 - create gfx_draw_sprite overload (#12026)
* Part of #12017 - create gfx_draw_sprite overload

Part 1. Creates the overload and replaces about a half of the calls since there are too many for one PR.

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-06-23 18:32:34 -03:00
Ted John
46d69126ea Split identifier and legacyIdentifier on Object 2020-05-08 15:28:48 +01:00
Gymnasiast
cc65564521 Use (RCT12)ObjectEntryIndex in more places 2020-05-01 22:06:13 +02:00
Michael Steenbeek
d86dce17e8 Prepare object indices for uint16_t (part 2) (#10966) 2020-03-18 21:27:53 +01:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
Gymnasiast
edaebd5163 Protect against Sources being null 2018-07-30 22:01:04 +02:00
Michael Steenbeek
2a64ec7aff Use sourceGame parameter in JSON files instead of originalId 2018-07-30 21:39:27 +02:00
clang-format
95ce592579 Enforce not breaking before assignments and function names
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-23 16:00:19 +02:00
Hielke Morsink
fdc6e52da1 Correct formatting in files from network to paint 2018-07-23 16:00:15 +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
Ted John
edb9dc39ab Pass object repository as a dependency when loading objects 2018-04-19 23:51:05 +01:00
Ted John
9dba4a87cc Fix #7389: Path items cannot be placed on sloped paths
Handle isAllowedOnQueue and isAllowedOnSlope separately
2018-04-08 18:46:01 +01:00
Ted John
83ce94fd9e Search for object file, case insensitive 2018-03-26 21:38:09 +02:00
Ted John
971e2dcaa2 Add JSON loading for walls 2018-03-26 21:37:23 +02:00
Ted John
12d2523752 Add JSON loading for footpath banners 2018-03-26 21:37:23 +02:00
Ted John
ec446ac9d6 Return image and string table by reference 2018-03-26 21:37:23 +02:00
Ted John
c3f075d18c Write helper method for parsing flags 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
d56f1445f8 Add JSON loading for footpath items 2018-03-26 21:35:44 +02:00
Gymnasiast
1b2c1a4d83 Fix #7111: Path items appear twice in build menu
Issue caused by #7106 - fixed it for banners, but forgot to fix it for path bits as well.
2018-02-01 11:39:34 +01:00
Michael Steenbeek
755add6c9a Compile localisation folder as C++ 2018-01-06 18:32:25 +01:00
Ted John
3dcbebcf68 Refactor drawing.c to C++ 2018-01-05 22:57:57 +01:00
Michael Steenbeek
347ff702d0 Refactor objects 2018-01-03 10:16:51 +01:00
Michael Steenbeek
c846d98516 Fix English descriptions of path additions and banners 2017-12-22 16:59:11 +01:00
Michael Steenbeek
6dc49d643a Compile files in base dir as C++ 2017-12-13 08:03:48 +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
Michael Steenbeek
a663ab6cd2 Add extra NULL checks 2017-11-13 21:14:39 +01:00
Michael Steenbeek
2ebac91a2e Add method to look up source game 2017-11-13 21:14:39 +01:00
Michael Steenbeek
11f2d60041 Automatically add all path bits and signs to the designated group 2017-11-13 21:14:39 +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
Ted John
25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00