mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Pass object repository as a dependency when loading objects

Browse Source
This commit is contained in:
Ted John
2018-04-19 23:51:05 +01:00
parent 4edb450594
commit edb9dc39ab
8 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,8 +83,10 @@ private:
static constexpr uint16 VERSION = 17;
static constexpr auto PATTERN = "*.dat;*.pob;*.json";
IObjectRepository& _objectRepository;
public:
explicit ObjectFileIndex(IPlatformEnvironment * env) :
explicit ObjectFileIndex(IObjectRepository& objectRepository, IPlatformEnvironment * env) :
FileIndex("object index",
MAGIC_NUMBER,
VERSION,
@@ -92,7 +94,8 @@ public:
std::string(PATTERN),
std::vector<std::string>({
env->GetDirectoryPath(DIRBASE::OPENRCT2, DIRID::OBJECT),
env->GetDirectoryPath(DIRBASE::USER, DIRID::OBJECT) }))
env->GetDirectoryPath(DIRBASE::USER, DIRID::OBJECT) })),
_objectRepository(objectRepository)
{
}
@@ -102,7 +105,7 @@ public:
auto extension = Path::GetExtension(path);
if (String::Equals(extension, ".json", true))
{
auto object = ObjectFactory::CreateObjectFromJsonFile(path);
auto object = ObjectFactory::CreateObjectFromJsonFile(_objectRepository, path);
if (object != nullptr)
{
ObjectRepositoryItem item = { 0 };
@@ -116,7 +119,7 @@ public:
}
else
{
auto object = ObjectFactory::CreateObjectFromLegacyFile(path.c_str());
auto object = ObjectFactory::CreateObjectFromLegacyFile(_objectRepository, path.c_str());
if (object != nullptr)
{
ObjectRepositoryItem item = { 0 };
@@ -213,7 +216,7 @@ class ObjectRepository final : public IObjectRepository
public:
explicit ObjectRepository(IPlatformEnvironment * env)
: _env(env),
_fileIndex(env)
_fileIndex(*this, env)
{
}
@@ -279,11 +282,11 @@ public:
auto extension = Path::GetExtension(ori->Path);
if (String::Equals(extension, ".json", true))
{
return ObjectFactory::CreateObjectFromJsonFile(ori->Path);
return ObjectFactory::CreateObjectFromJsonFile(*this, ori->Path);
}
else
{
return ObjectFactory::CreateObjectFromLegacyFile(ori->Path);
return ObjectFactory::CreateObjectFromLegacyFile(*this, ori->Path);
}
}
@@ -310,7 +313,7 @@ public:
object_entry_get_name_fixed(objectName, sizeof(objectName), objectEntry);
// Check that the object is loadable before writing it
Object * object = ObjectFactory::CreateObjectFromLegacyData(objectEntry, data, dataSize);
Object * object = ObjectFactory::CreateObjectFromLegacyData(*this, objectEntry, data, dataSize);
if (object == nullptr)
{
Console::Error::WriteLine("[%s] Unable to export object.", objectName);
@@ -659,18 +662,6 @@ const rct_object_entry * object_list_find(rct_object_entry * entry)
return result;
}
const rct_object_entry * object_list_find_by_name(const char * name)
{
const rct_object_entry * result = nullptr;
auto objRepo = GetContext()->GetObjectRepository();
auto item = objRepo->FindObject(name);
if (item != nullptr)
{
result = &item->ObjectEntry;
}
return result;
}
void object_list_load()
{
auto context = GetContext();