mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary fields in ObjectRepository

This commit is contained in:
Ted John 2017-08-30 22:05:12 +01:00
parent f2cd0b2f3b
commit f371d5c65f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,8 +196,6 @@ class ObjectRepository final : public IObjectRepository
ObjectFileIndex const _fileIndex; ObjectFileIndex const _fileIndex;
std::vector<ObjectRepositoryItem> _items; std::vector<ObjectRepositoryItem> _items;
ObjectEntryMap _itemMap; ObjectEntryMap _itemMap;
uint16 _languageId = 0;
sint32 _numConflicts = 0;
public: public:
ObjectRepository(IPlatformEnvironment * env) ObjectRepository(IPlatformEnvironment * env)
@ -221,7 +219,6 @@ public:
void Construct() override void Construct() override
{ {
_languageId = gCurrentLanguage;
auto items = _fileIndex.Rebuild(); auto items = _fileIndex.Rebuild();
AddItems(items); AddItems(items);
SortItems(); SortItems();
@ -389,10 +386,15 @@ private:
void AddItems(const std::vector<ObjectRepositoryItem> &items) void AddItems(const std::vector<ObjectRepositoryItem> &items)
{ {
size_t numConflicts = 0;
for (auto item : items) for (auto item : items)
{ {
AddItem(item); if (!AddItem(item))
{
numConflicts++;
}
} }
Console::Error::WriteLine("%zu object conflicts found.", numConflicts);
} }
bool AddItem(const ObjectRepositoryItem &item) bool AddItem(const ObjectRepositoryItem &item)
@ -409,7 +411,6 @@ private:
} }
else else
{ {
_numConflicts++;
Console::Error::WriteLine("Object conflict: '%s'", conflict->Path); Console::Error::WriteLine("Object conflict: '%s'", conflict->Path);
Console::Error::WriteLine(" : '%s'", item.Path); Console::Error::WriteLine(" : '%s'", item.Path);
return false; return false;