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

Implement @ZehMatt's suggestions

Browse Source
This commit is contained in:
Gymnasiast
2020-11-06 11:59:02 +01:00
parent ce15e20c94
commit 880a267252
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,27 +47,6 @@
using namespace OpenRCT2;
struct ObjectIdentifierHash
{
size_t operator()(std::string_view identifier) const
{
uint32_t hash = 5381;
for (auto i : identifier)
{
hash = ((hash << 5) + hash) + i;
}
return hash;
}
};
struct ObjectIdentifierEqual
{
bool operator()(std::string_view lhs, std::string_view rhs) const
{
return lhs == rhs;
}
};
struct ObjectEntryHash
{
size_t operator()(const rct_object_entry& entry) const
@@ -89,7 +68,7 @@ struct ObjectEntryEqual
}
};
using ObjectIdentifierMap = std::unordered_map<std::string, size_t, ObjectIdentifierHash, ObjectIdentifierEqual>;
using ObjectIdentifierMap = std::unordered_map<std::string, size_t>;
using ObjectEntryMap = std::unordered_map<rct_object_entry, size_t, ObjectEntryHash, ObjectEntryEqual>;
class ObjectFileIndex final : public FileIndex<ObjectRepositoryItem>
@@ -467,7 +446,7 @@ private:
{
rct_object_entry entry = _items[i].ObjectEntry;
_itemMap[entry] = i;
if (_items[i].Identifier != "")
if (!_items[i].Identifier.empty())
{
_newItemMap[_items[i].Identifier] = i;
}
@@ -499,7 +478,7 @@ private:
auto copy = item;
copy.Id = index;
_items.push_back(copy);
if (item.Identifier != "")
if (!item.Identifier.empty())
{
_newItemMap[item.Identifier] = index;
}