mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Remove remnants of STEX support

Browse Source
This commit is contained in:
Michael Steenbeek
2018-08-29 23:29:45 +02:00
committed by GitHub
parent 64b923e5c1
commit 5cd4057c76
13 changed files with 32 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/openrct2/object/ObjectRepository.cpp
View File

@@ -36,7 +36,6 @@
#include "ObjectList.h"
#include "ObjectManager.h"
#include "RideObject.h"
#include "StexObject.h"
#include <algorithm>
#include <memory>
@@ -671,7 +670,7 @@ void* object_repository_load_object(const rct_object_entry* objectEntry)
return (void*)object;
}
void scenario_translate(scenario_index_entry* scenarioEntry, const rct_object_entry* stexObjectEntry)
void scenario_translate(scenario_index_entry* scenarioEntry)
{
rct_string_id localisedStringIds[3];
if (language_get_localised_scenario_strings(scenarioEntry->name, localisedStringIds))
@@ -685,30 +684,6 @@ void scenario_translate(scenario_index_entry* scenarioEntry, const rct_object_en
String::Set(scenarioEntry->details, sizeof(scenarioEntry->details), language_get_string(localisedStringIds[2]));
}
}
else
{
// Checks for a scenario string object (possibly for localisation)
if ((stexObjectEntry->flags & 0xFF) != 255)
{
auto objectRepository = GetContext()->GetObjectRepository();
const ObjectRepositoryItem* ori = objectRepository->FindObject(stexObjectEntry);
if (ori != nullptr)
{
Object* object = objectRepository->LoadObject(ori);
if (object != nullptr)
{
auto stexObject = static_cast<StexObject*>(object);
auto scenarioName = stexObject->GetScenarioName();
auto scenarioDetails = stexObject->GetScenarioDetails();
String::Set(scenarioEntry->name, sizeof(scenarioEntry->name), scenarioName.c_str());
String::Set(scenarioEntry->details, sizeof(scenarioEntry->details), scenarioDetails.c_str());
delete object;
}
}
}
}
}
size_t object_repository_get_items_count()