From dfa40ccd461881549ba3652867fef55f9eadd172 Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 8 Feb 2018 18:46:01 +0000 Subject: [PATCH] Read objects from OpenRCT2 data instead of RCT2 --- src/openrct2/object/ObjectRepository.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index b0887ac012..0df230554c 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -90,8 +90,8 @@ public: env->GetFilePath(PATHID::CACHE_OBJECTS), std::string(PATTERN), std::vector({ - env->GetDirectoryPath(DIRBASE::USER, DIRID::OBJECT), - env->GetDirectoryPath(DIRBASE::RCT2, DIRID::OBJECT) })) + env->GetDirectoryPath(DIRBASE::OPENRCT2, DIRID::OBJECT), + env->GetDirectoryPath(DIRBASE::USER, DIRID::OBJECT) })) { } @@ -433,9 +433,8 @@ private: } else { - // Commented out temporarily to stop flooding terminal for json-objects branch - // Console::Error::WriteLine("Object conflict: '%s'", conflict->Path); - // Console::Error::WriteLine(" : '%s'", item.Path); + Console::Error::WriteLine("Object conflict: '%s'", conflict->Path); + Console::Error::WriteLine(" : '%s'", item.Path); return false; } }