From f371d5c65feb967470111cad23876b53c6433b37 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Wed, 30 Aug 2017 22:05:12 +0100
Subject: [PATCH] Remove unnecessary fields in ObjectRepository

---
 src/openrct2/object/ObjectRepository.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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