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

Don't report object conflicts

This commit is contained in:
Ted John 2017-12-17 00:50:32 +00:00 committed by Gymnasiast
parent ede51ded86
commit f6a6169ca2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,8 +433,9 @@ private:
}
else
{
Console::Error::WriteLine("Object conflict: '%s'", conflict->Path);
Console::Error::WriteLine(" : '%s'", item.Path);
// 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);
return false;
}
}