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

Do not log 0 conflicts

This commit is contained in:
Ted John 2017-08-31 18:00:33 +01:00
parent 0df10cc41d
commit 50735c0f68
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,8 +394,11 @@ private:
numConflicts++; numConflicts++;
} }
} }
if (numConflicts > 0)
{
Console::Error::WriteLine("%zu object conflicts found.", numConflicts); Console::Error::WriteLine("%zu object conflicts found.", numConflicts);
} }
}
bool AddItem(const ObjectRepositoryItem &item) bool AddItem(const ObjectRepositoryItem &item)
{ {