mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Read objects from OpenRCT2 data instead of RCT2

Browse Source
This commit is contained in:
Ted John
2018-02-08 18:46:01 +00:00
committed by Gymnasiast
parent 668f9fd18b
commit dfa40ccd46
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,8 +90,8 @@ public:
env->GetFilePath(PATHID::CACHE_OBJECTS),
std::string(PATTERN),
std::vector<std::string>({
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;
}
}