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

Improve FileIndex (#17773)

Browse Source
This commit is contained in:
skdltmxn
2022-08-14 04:32:59 +09:00
committed by GitHub
parent adc51ad9aa
commit 6aabe38590
4 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@ public:
}
public:
std::tuple<bool, ObjectRepositoryItem> Create([[maybe_unused]] int32_t language, const std::string& path) const override
std::optional<ObjectRepositoryItem> Create([[maybe_unused]] int32_t language, const std::string& path) const override
{
std::unique_ptr<Object> object;
auto extension = Path::GetExtension(path);
@@ -113,6 +113,7 @@ public:
{
object = ObjectFactory::CreateObjectFromLegacyFile(_objectRepository, path.c_str(), false);
}
if (object != nullptr)
{
ObjectRepositoryItem item = {};
@@ -125,13 +126,13 @@ public:
item.Authors = object->GetAuthors();
item.Sources = object->GetSourceGames();
object->SetRepositoryItem(&item);
return std::make_tuple(true, item);
return item;
}
return std::make_tuple(false, ObjectRepositoryItem());
return std::nullopt;
}
protected:
void Serialise(DataSerialiser& ds, ObjectRepositoryItem& item) const override
void Serialise(DataSerialiser& ds, const ObjectRepositoryItem& item) const override
{
ds << item.Type;
ds << item.Generation;
@@ -443,11 +444,9 @@ private:
void ScanObject(const std::string& path)
{
auto language = LocalisationService_GetCurrentLanguage();
auto result = _fileIndex.Create(language, path);
if (std::get<0>(result))
if (auto result = _fileIndex.Create(language, path); result.has_value())
{
auto ori = std::get<1>(result);
AddItem(ori);
AddItem(result.value());
}
}