mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Feature #11817: Show authors field in object selection (#12591)

Browse Source 
* 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
This commit is contained in:
Tom Parsons
2020-08-09 06:23:28 +01:00
committed by GitHub
parent 5f68927e88
commit c4ae579a84
7 changed files with 83 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/object/ObjectFactory.cpp
View File

@@ -442,6 +442,26 @@ namespace ObjectFactory
{
throw std::runtime_error("Object has errors");
}
auto authors = json_object_get(jRoot, "authors");
if (json_is_array(authors))
{
std::vector<std::string> authorVector;
for (size_t j = 0; j < json_array_size(authors); j++)
{
json_t* tryString = json_array_get(authors, j);
if (json_is_string(tryString))
{
authorVector.emplace_back(json_string_value(tryString));
}
}
result->SetAuthors(std::move(authorVector));
}
else if (json_is_string(authors))
{
result->SetAuthors({ json_string_value(authors) });
}
auto sourceGames = json_object_get(jRoot, "sourceGame");
if (json_is_array(sourceGames))
{