From 47fe2d42b1edb1ecfd66f67e1a8f7981fa2accfb Mon Sep 17 00:00:00 2001
From: wolfreak99 <jbminor1991@gmail.com>
Date: Wed, 19 Oct 2016 15:33:51 -0400
Subject: [PATCH] Count number of object conflicts during scan

---
 src/object/ObjectRepository.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/object/ObjectRepository.cpp b/src/object/ObjectRepository.cpp
index f81b30a51d..da913cb4ba 100644
--- a/src/object/ObjectRepository.cpp
+++ b/src/object/ObjectRepository.cpp
@@ -99,6 +99,7 @@ class ObjectRepository : public IObjectRepository
     QueryDirectoryResult                _queryDirectoryResult = { 0 };
     ObjectEntryMap                      _itemMap;
     uint16                              _languageId = 0;
+    int                                 _numConflicts;
 
 public:
     ObjectRepository(IPlatformEnvironment * env)
@@ -247,6 +248,7 @@ private:
         Path::GetDirectory(objectDirectory, sizeof(objectDirectory), gRCT2AddressObjectDataPath);
 
         Console::WriteLine("Scanning %lu objects...", _queryDirectoryResult.TotalFiles);
+        _numConflicts = 0;
 
         auto stopwatch = Stopwatch();
         stopwatch.Start();
@@ -258,6 +260,10 @@ private:
 
         stopwatch.Stop();
         Console::WriteLine("Scanning complete in %.2f seconds.", stopwatch.GetElapsedMilliseconds() / 1000.0f);
+        if (_numConflicts > 0)
+        {
+            Console::WriteLine("%d object conflicts found.", _numConflicts);
+        }
     }
 
     void ScanDirectory(const std::string &directory)
@@ -390,6 +396,7 @@ private:
         }
         else
         {
+            _numConflicts++;
             Console::Error::WriteLine("Object conflict: '%s'", conflict->Path);
             Console::Error::WriteLine("               : '%s'", item->Path);
             return false;