mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Close #21375: extend to allow loading JSON objects

Browse Source
This commit is contained in:
Gymnasiast
2025-10-23 17:28:07 +02:00
parent e3d9cc1c96
commit 8e7bc2bc43
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -2,6 +2,7 @@
------------------------------------------------------------------------
- Feature: [#25286] Footpath area dragging tool.
- Feature: [#25379] Add an option to the command line screenshot function to draw debug segment heights.
- Improved: [#21375] The `load_object` console command now allows loading JSON objects.
- Improved: [#25297] Paths on the ground in SV4/SC4 no longer block supports of the paths above.
- Improved: [#25349] ‘Recent Messages’ window can now be fully themed.
- Change: [#25089] Peep actions and animations that cause them to stop moving no longer trigger when they are on a level crossing.

29
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -1057,22 +1057,32 @@ static void ConsoleCommandLoadObject(InteractiveConsole& console, const argument
return;
}
char name[9] = { 0 };
std::fill_n(name, 8, ' ');
std::size_t i = 0;
for (const char* ch = argv[0].c_str(); *ch != '\0' && i < std::size(name) - 1; ch++)
auto& objectRepository = GetContext()->GetObjectRepository();
auto objectName = argv[0];
// First, try and find a JSON object by this name
const ObjectRepositoryItem* ori = objectRepository.FindObject(objectName);
// If this fails, try loading by DAT name
if (ori == nullptr)
{
name[i++] = *ch;
char name[9] = { 0 };
std::fill_n(name, 8, ' ');
std::size_t i = 0;
for (const char* ch = objectName.c_str(); *ch != '\0' && i < std::size(name) - 1; ch++)
{
name[i++] = *ch;
}
ori = objectRepository.FindObjectLegacy(name);
}
const ObjectRepositoryItem* ori = ObjectRepositoryFindObjectByName(name);
if (ori == nullptr)
{
console.WriteLineError("Could not find the object.");
return;
}
const auto* entry = &ori->ObjectEntry;
const auto* loadedObject = ObjectManagerGetLoadedObject(ObjectEntryDescriptor(*ori));
if (loadedObject != nullptr)
{
@@ -1080,7 +1090,8 @@ static void ConsoleCommandLoadObject(InteractiveConsole& console, const argument
return;
}
loadedObject = ObjectManagerLoadObject(entry);
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
loadedObject = objectManager.LoadRepositoryItem(*ori);
if (loadedObject == nullptr)
{
console.WriteLineError("Unable to load object.");
@@ -1088,7 +1099,7 @@ static void ConsoleCommandLoadObject(InteractiveConsole& console, const argument
}
auto groupIndex = ObjectManagerGetLoadedObjectEntryIndex(loadedObject);
ObjectType objectType = entry->GetType();
ObjectType objectType = loadedObject->GetObjectType();
if (objectType == ObjectType::ride)
{
// Automatically research the ride so it's supported by the game.