mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity
20,071 Commits 8 Branches 59 Tags
8e73dfd4405972b380cd6ec1fb3a0a3967f22a46
Commit Graph

70 Commits

Author SHA1 Message Date
Vinicius Sa
8e73dfd440 Fix possible memory leak in CreateObjectFromJson 
As reported by PVS-Studio. Warning: V773.

Fix 1/7.

Issue: 12523
 2020-10-06 18:20:37 -03:00
Michael Steenbeek
8e60ecc022 Do not output error if the sourceGame parameter is omitted (#13079) 
Since >90% of objects in the wild are custom objects, it make sense if this
parameter can be safely omitted. Only warn if this field contains garbage.
 2020-10-03 14:41:52 -03:00
Simon Jarrett
97b44a7181 Refactor ObjectFactory to use new JSON library 
- Removed a few try-catch blocks as this is now handled in Json::Read[...]
 2020-09-16 20:18:53 +01:00
Tom Parsons
c4ae579a84 Feature #11817: Show authors field in object selection (#12591) 
* Feature #11817: Show authors field in object selection

- authors field in JSON shows as last line in bottom right on object selection
- authors field added to Object class
- ObjectFileIndex version bump as authors is serialised

* fix sign comparison warning

* Start object selection corner text higher to avoid overlap

* Use references to reduce unneccessary copies

* make GetAuthors const

* Clip drawing of authors string so it doesn't cross widgets

At max length the leftmost aligns exactly with description left

* Add a changelog message

* make SetAuthors use an rvalue reference

* remove unnecessary nullptr check
 2020-08-09 06:23:28 +01:00
Matt
0dc43d66e4 Remove the use of INTERFACE macro and macro its self 2020-08-05 16:30:44 +02:00
Matt
83355e35cc Move IStream, MemoryStream, FileStream into OpenRCT2 namespace 2020-08-05 16:29:36 +02:00
Matt
30376085cf Include missing headers 2020-08-05 16:29:29 +02:00
Ted John
46d69126ea Split identifier and legacyIdentifier on Object 2020-05-08 15:28:48 +01:00
Michał Janiszewski
2323cc1596 Use named casts instead of old-style casts 
Change prepared with clang-tidy and google-readability-casting check
 2020-04-22 17:09:29 +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
18ebe73dfa Replace object_entry_get_type() with method (#10937) 2020-03-15 12:07:04 +01:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
Michał Janiszewski
8a70b29f64 Fix GCC's warning regarding enum vs non-enum values being compared (#8551) 2019-01-04 21:29:44 +01:00
Michał Janiszewski
635e46af83 Plug memory leak in ObjectFactory::CreateObjectFromZipFile 2019-01-02 19:57:41 +01:00
ζeh Matt
7d19a5bc77 Refactor memcpy to std::memcpy and memset to std::memset (#8408) 2018-12-15 22:23:31 +01:00
Ted John
06f203a7e7 Implement surfaces, edges and stations as objects 2018-12-09 23:30:40 +00:00
Michał Janiszewski
cec86469f0 Improve imported object handling (#8372) 
Reject and report invalid objects rather than triggering assert.
 2018-12-05 23:12:22 +01:00
Hielke Morsink
6e62186d01 Fix #8034: screenshot command outputs broken sprites (#8041) 
Check for no-graphics instead of headless when creating objects.
 2018-10-02 20:09:08 +01:00
Michael Steenbeek
5cd4057c76 Remove remnants of STEX support 2018-08-29 23:29:45 +02:00
Linus Unnebäck
fd07be587a Remove Math::Clamp in favour of std::clamp 2018-08-12 16:47:12 +01:00
Gymnasiast
0ba233efa4 Fix formatting 2018-07-31 22:27:00 +02:00
Gymnasiast
8ff6831c57 Fix rebase errors 2018-07-30 21:52: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
Michael Steenbeek
5ce76e1603 Attempt at showing secondary source game 2018-07-30 21:28:55 +02:00
Hielke Morsink
0b03464186 Replace 0 and NULL with nullptr (#7827) 2018-07-25 22:49:20 +02:00
clang-format
b02dfdbc93 Binpack function arguments together 
Previously when the arguments of a function wouldn't fit on a single line, clang-format would put each argument on its own line instead. By enabling the binpack parameter setting, it tried to fit as many on one line as possible instead.

Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2018-07-23 16:00:22 +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
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
8c1ed596ce Apply review changes 
- Print warning/error code in log message
- Remove attribute from Object::SetSourceGame which has a FIXME comment already instead
 2018-06-06 21:03:11 +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
Hielke Morsink
5d0022a5cb Remove argument list from zero-initializers with zero/false/nullptr value 2018-06-04 19:50:46 +02:00
Aaron van Geffen
8c3766288b Address clang 6.0 compilation errors. 2018-05-13 23:22:40 +02:00
Ted John
4e86d18dad Support loading images from zip 2018-05-13 12:04:45 +01:00
Ted John
580f1baff2 Get basic relative .png loading 2018-05-13 11:36:35 +01:00
Ted John
9aef466b9b Fix bugs with zip and object manager changes 2018-05-13 11:36:35 +01:00
Ted John
23efe7f339 Load JSON from file or zip 2018-05-13 11:36:35 +01:00
Hielke Morsink
8d10bfb5a1 Add namespace closing comments 2018-05-04 22:54:43 +02:00
Ted John
edb9dc39ab Pass object repository as a dependency when loading objects 2018-04-19 23:51:05 +01:00
Michał Janiszewski
c4d5920140 Fix catching of polymorphic exception 2018-03-27 20:45:02 +02:00
Ted John
f3c125853b Do not load images for objects if in headless mode 2018-03-26 21:38:09 +02:00
Ted John
83ce94fd9e Search for object file, case insensitive 2018-03-26 21:38:09 +02:00
Ted John
668f9fd18b Correct some ride JSON names 2018-03-26 21:38:09 +02:00
Gymnasiast
b207797ad2 Fix rebase errors 2018-03-26 21:38:08 +02:00
Ted John
a03b58501b Add JSON loading for small scenery 2018-03-26 21:37:23 +02:00
Ted John
1e3ce8754e Add JSON loading for large scenery 2018-03-26 21:37:23 +02:00
Ted John
971e2dcaa2 Add JSON loading for walls 2018-03-26 21:37:23 +02:00
Ted John
ede51ded86 Add JSON loading for scenery groups 2018-03-26 21:37:23 +02:00